Repo Query FIx