Billing speedup

REINDEX REQUIRED

billing speedup updates sanctioned by @biyeun