Refactor where commands in movie controller