Fixed issue with indexed options showing up as text fields
Added default value option