Fixes #1201 - Don't call getter after a previous count call returned 0 items
Docs cleanup
Merge branch 'Srokap-ticket_1201'