Refine [[HandleFetch]] algorithm