LUGG-138 : Improvements for headings and pagers