Restore EndsWith/Contains support