Add "single" Queryer
Merge conflicts