Move all oredict searching to post-init