Improved media and privacy detection

Signed-off-by: Lars Johansson <newmedia@xs4all.nl>