Fixed Querying Users which was broken in a refactor. Mainly done by Fred; Jason and I helped.