template fixes after removal of orderedFields()