Fixing exact matches even more