Fixed domain name insertion to work with https:// urls and only check the begining of the string
Slight simplification to date parsing