Card #257: fix for search by identifier