BUG: Documents won't show if not uploaded
Merge branch 'develop'