[eQT] logic clean up…