Fix for search page - work in progress.