Support Phi Search even more