Fixed search for images, tweaked video template
Merge of recent changes