Tweaks to support Toys search for fr