Updated TagCanvas