Closes #3386193
This adds validation logic to prevent a bundle that does not contain the field from being selected.