Added Column Option Selection and more query data to xml