Improve keyword regex