ABS-168 - Update Tidbit to generate correct tags data