Fix for failing search tests