Little bug when searching waffles - requests merge