LPS-32637

LPS-32637 - commit's refactored according the Sergio's feedback. This contains fix for Document and Media and Document and Media display