fixed compatibility with SearchStuff