query experiments
added todo
fixes
Merge remote-tracking branch 'origin/query-experiment'