Fixes streams field.choice form dropdown value - Issue #2729

This was depending on entry_id but it was null =(