Feature 4 search fixes