SIT-637
corrected order of SFDC queries