form-builder and router fixes