More search backend polish