Improve next_actions behavior