improve get_(org)_user_events