Cut out /v3/expand request; misc bug fixes