Cleanup - moved search functionality in separate control