Rework queries used in visuals (query fields moved to another query)

Hi, I am looking for advice for how to best go about the following task (research here in the posts and generally did not result in something usable): I need to update/consolidate the underlying da...