Fixed issue with search breaking the page