Changed default StringFilterExpressionCreator to be containing serach and made some cosmetic changes.