fixing various issues with the entity context form and how argument keywords are handled in the entity_id plugin per #1046074