Aroma Search Improvements