Add two rewrites for string contains character (#2492)