Simplify the tags handling