Issue by smithworx: improved entity counts to exclude translation set nodes, fixed comment upload query bug