Clean up search and filter ui