Improved the search plugin