cleaner macro as deftao
fix query pull out