Revert 'disable search form for presentation (just to be sure ;D)'
Merge branch 'master' into caching