Bug Fixes with templates and new meta values