3535 Separate subscriptions by type

https://code.google.com/p/otwarchive/issues/detail?id=3535

Updating https://github.com/otwcode/otwarchive/pull/1144