Refined 2 value parsing
Query print cleanup