BUG-1027: rework lookup for clarity