City rewrites film ordinance proposal