fix query/option mismatch