Improved service calls in EntityDataLoader to replace hyphen with hash and to support entity auto services