Add support for NULL input selection and updated query xmls