Update queryable interface so that it doesn't mutate
Actually fix the issue, rather than pretending to
Merge pull request #1060 from mootpointer/queryable_mutation_fix

Update queryable interface so that it doesn't mutate