Fix untagged entity, make tag matching case independent, look for untagged entities locally.