[TASK] Split inclusion of page fields into standard and added doktypes