Search display controller fix merged