Make tap_ref match similar code in update
Use Formula tap methods