Remove duplicate code for advanced media view (#4862)