Improved searching with special characters