I am looking to build a summarized report that shows all active & completed forms in a specific process, however when grouping them I am running into an issue.  If I group them by "Current Step/Stage", then it shows the actual name of the step or stage for those in process but does not include any that have been completed.  If I group them by "Last Step", then it groups the completed forms correctly but shows "is blank" for the in-process forms. 

I need a way in the same report to group by the "Current Step" or "Current Stage" for those that are active, and by the "Last Step" or "End Stage" (which is not currently an option) for those that are complete.  Has anyone found a way to group by the step/stage for for in-process and completed forms within a summarized report?