Massive retooling query to support Qo 0.3.0 spec
Simplify action code and Qo field generation