Restructured the batch of queries that process a ForcePlanner entry.