[ALOY-1092] Expanded TSS query options
Merge pull request #584 from skypanther/ALOY-1092

[ALOY-1092] Expanded TSS query options