Fix to input handler to support space -> underscore conversion.