Added cases for QueryVariables... I'm not sure they are correct, yet.