attribute based entity bug fixes after latest changes