DATASOLR-116 - Fix mapping for overlapping wildcard expressions