some fixes for search plugin