Ashwin/ajay | #2688 | delegating creation of headers to different classes.
Ashwin/ajay | #2688 | Refactoring filter by submission type part.
Ashwin/ajay | #2688 | Refactoring creation of  response in submission query.
Ashwin/Ajay | #2688 | Fixing failing ut
Ashwin/Ajay | #2688 | Reordering filter positions.