Ajay | #0000 | Fixing fts after recent class changes - part 2