changed data-bag handling