Fixed issue with search button not updating current url properly