Version allowing for non-acs queries