work in progress - object query decoulping