Fix onboard project query as well