Fix criteria with embedded array