Fixed issues on search page