Moving some code around

Moving some default query variables to connection declaration.  Didn't
know you could do that...