Fix for search pages