Fixes for local searches, dealing with null remote searches