Fix up the logic for result expanding the various extension