Changes between #15 and #16

#16 (Aug 20, 2018, 5:01:12 PM)

1. There is only a single entity block id (commit: 61d5f8a) — Brokkonaut / detail
2. Add some null-checks (commit: c2b2165) — Brokkonaut / detail