Fixes a few bugs + added listing helper for media list