AutoSearch fix