search, bugfixing