Forms: optimise api calls