Merge branch 'fix_citizen_schedule_index' into 'develop'

Fix schedule index for citizens

See merge request !89
3 jobs for develop in 1 minute and 16 seconds (queued for 9 seconds)