fixed a hack
fixed pagination
moved first page const to model
Merge branch 'bugid-100494' into consumer-wam