You are welcome! If the same app is handling too much logic, we could break it into multiple apps. This improves performance and avoid bugs that could be caused by a complex dependency chain. It may not be the case though, it is hard to tell from looking at a few queries.
If you are still experiencing these issues, feel free to join us during Office Hours, we are happy to take a closer look. 