Improved find entries