MS-309: separate collection for indexable items
Merge branch 'MS-309-multiple-layouts' of http://github.com/myplanetdigital/neompd into MS-309-multiple-layouts