add additional check for value in form props
add additional check for value in form props

only search for last path component

dimagi/commcare-hq,dimagi/commcare-hq,dimagi/commcare-hq,dimagi/commcare-hq,dimagi/commcare-hq