improvements on selection field and photo field