Removing string concatenation for entities

Done for:
https://issues.jboss.org/browse/AGPUSH-566