Changes to template system by Josh, changes to movies by Ugo, change movies to use searchname only. Better matching.