fixed declared query, remove columnpair in favor of simple Pair