[DF-4070] Improved tags handling