Bug fix for inputs and selects