General fixes related to Find A Gift functionality