Cleanup and fixing some wonkiness around the default search behavior