use entity tokens to allow special characters with auto entity label
update version to 7.x-1.4