Major rework including templated metatags