ViewerAsset - fix
reply comments - fix
refactoring