[3.8] Search engine fixes