Add support for multiple matches, and non exact matches