bugfixes to selector search