fix bug with flags paging and displays
Merge branch 'bug-fix' into develop