Probably a better home for Scope related Query code
Added an idea