Update fetching to prevent empty forms