fix column names and bound query by june 1