Improve media-query integrity