Bugfixing on search against new database format