Fixes order of heavy omni completion