1. Search handling improved