Consolidate steps for separate audit queries