Search & search input cleanups