Added a flag to control whether media queries are excluded