RF-13614: fix tag handler delegate