Improved abbreviation check