fix content fetching logic