Parse text input values as well, fix bug