Added a search that does not work great yet