memory consumption fix; tags improvment