removed query dependency for form addon