Update to working tag api