fix querying for current user