changes for enterprise version

Changes for working on any enterprise version url. 
(Not all, but works fine in my environment :)