Fix test_sqlitecache for new searchterm behavior
Fix merge error in httphandler