AW-1692 #comment delete obsolete ds fields
#AW-1692 fix subpages