Add a workaround for the not working onCloseListener on SearchView
Greatly improve the search feature and fix a few bugs