Added keyword substring performance