Search works better, adding rarity