Column count in collection template is still wrong (#1091)