Corrected the data fetching to only fetch the correct data