Update item page generator to be more compliant