fix for the FTS functionality logic
some merge conflict leftover
Merge pull request #45 from ardasgup/master

Fix for the 24x7 FTS functionality