Pooja/Ajay | #000 | Fixing FTs after merging 'All Data' page