Fixed query and header validation
0.0.8