Templates fix (but not import) and host group fix