Potential fixes to search.php for #88 and #89