Removed console.log; Improved search