master [changing query to only return active users]