Changed the way that Zero Option Criteria are found in order to reduce query counts.