fixed Entity subject uri behaviour