Fix edts-query