Added support for textareas and select