Bug 899984 - Everything.Me search results take a long time to show

master -> merge
v1-train -> not tested