LX-5389
change tag flow
LX-5391