Fix Mismatch - Need a lot of improvement

Thanks for the screenshots!

This suggestion might help: Can’t find correct match