Improve snap support
Connecting isn't necessary anymore Only search when the query has something to search