Use a context property on queries
Refactor query execution into Query model
Comment actions shouldn't trigger a selection
Rewrite/split query model and fix more empty tests