with enhanced search