Fixing Query Var