Adding support for different kind of media and sorting the results