Improve main search for mobile