Now we can use contains for filters
Doing some refactoring
Adding icontains and tested it