Improved performance in media browser (issue #2136)