Improve word match