References #169 - Optimizing DB queries resulting from browsing nested object lists.
References #169 - The full locations list loads faster now.
Merge branch 'master' into 169-slowness_issues