Fix up the where clause generation, and add more of the film api.