Search and sctrict mode fixed