Register focus queries in separate Graph
Fixes #41-metrics