bug fix
removed function _getEntityTypeName
refactored function _getEntityId