fix a couple of subtle bugs in fields handling
fix how bill_id lookups are handled