Fixed bug in host calc
Fixed url bug in whitelisting
Fixed merge