fix #245 and #248 with non-crippled search provider