fix(archive) fix media retrieval, minor cleanup
Merge pull request #153 from amagdas/master

fix(archive) fix media retrieval, minor cleanup