Make entityview work with Properties again

Change-Id: Ic0434bdf7b3f755c00614b4fed7e01157b84dc6a