added atc-expand for query