reverting back to last copy of et-query to resolve issues