Improve Flirt matching