code gardening
improve custom field test
ensure local tuple queries are deferred until subscribe
code gardening