Adjust topics and entries, and WIP Invoice Builder Service