better handle special entity properties for all cases