Fix entity subset selection
Fix deprecated clears in AAs
Merge branch 'hotfix/1.0.5'