fix: added check for lang und entities;