adding GetCurrentUser and default null on queries