Revice _dt fields to support wildcards