Improve the input filtering on new entities added to MatchFieldset