Custom tag improvements