Improve username matching