step 1 fix for add tags on the fly solution