Resolving #1232 - ambiguity of Media Source field