Ensure the right data is queried