Search and Feedback fix