some more search.php details
Merge branch 'master' into next