Improve Selevision detection