fixing the condition that decides when to use the old_ query var retrieval stuff