Simplified the marketing field pattern match code