I was wary of touching the logic in selectQuery() given the note from you at the top that says "beware ye all who enter here!"