Review fixes and Upgrades to search test page