Updated xe-host-data-source-list and xe-host-datasource-query