Third pass at separating out connect options from query options