Refine and fix catalog search, autocomplete and repeat order