Search feature is now more accurate