Films optimisation and bugfix
Films optimisation and bugfix

Improved performance and prevented error throwing from Films by
improving edit control persistence mechanism.

DavidRalph/floop,DavidRalph/floop,DavidRalph/floop