fixing search pages related issues