fix: correctly use filtered form fields when preparing the connection data.

fix: correctly use filtered form fields when preparing the connection data. #421