Corrected handling of criteria fields