Major updates to the search plugin