Fixed selection for inputs
Fixed message body type