Re-factor persist queue to group TargetRequests by query