refactored search by identifier