Fix mobile & tablet queries