fixed bugs in entity images view
merged origin