Place dppx queries first and remove Opera query