Temporary fix for agg search bug