Made search smarter (Country: and Property: keyword)