[6] Improved search to be on the fly and faster