started adding partial query support