Fix options
Criteria without options fix