Make sure we query the columns we use during schema refresh

JAVA-77 #fixes