latest regex fixes
missing ?
supporting fqdn
merging