Fixes for file not visible in viewer

Gyan Guptarequested to merge
bug_fix/375-file-not-visible-in-viewer into develop

Merge request reports