Made search query more intelligent