Fixing bug with handling single KPI page
Merging in Anthony's passport stuff