Fix tag handing methods of api