LPS-30300 Make app_view_entry consistent