Enhance condition in findByAbbr