bugzid 3589: removed paging and fixed image states - develop