First Steps of Improvements to the HL7QueryModule