search bugfixes