Fix slow PersonList page
Merge branch 'develop'