Bugfixes in search