Improve 'find by value'