bug fixes, issue with 1-11-2 pages... Should use array and not object on pages