Fix 595-71, improve search by food type