Improve search and filter bar