adding fixes for json and tags handling