Refactor fetching logic so that non-image tiles can be collected as well.