complex improvements, select option in form