Adding back context to angular form and form-list