Improve fix for removal of GWT Module name from Base URL