Fixed tags handling.