refactor Query as single case class with Vector[(String, String)]