Improve prefix and suffix of exact match regex

Fix suffix when the final character is numeric, so that "Finepix Z3
5.1MP" does not match a "FinePix Z35".

Fix prefix so that "Leica V-Lux-1" does not match a Leica "X1".