Fixed fetching logic for infrastructure resources