improved search performance, fixes #2