Return to results is now schema aware