[FOLLOWUP][FEATURE] Improve handling of online media