Created a testable convertor for queries from V1 -> V2