change operator search logic to local only