Modify Survey component to fix issue with number type answer