Fixed last few queries to media