Query fixes.

I really don't see anything wrong with this query. It seems to return
the right number of members.