removed the special case check in the user fetch query, its not needed and may be causing problems