[3.9] Search engine subscriber fixes