Fixed issues with media-query and breakpoint-helper utitlities