Catch invalid vs query strings and add a test for them [RD-16]