Preminilary version of search, it's working now but need some additional features
Minor changes
Not big changes, just testing