Update Search tweaks to Gem