Mario/d3| #1165 | Fix search logic to limit results