Fixed issues with not querying users correctly.