Started work on simplifying multiple target queries for analysis.