Added support for numeric entity ID matching.