[ALOY-1092] Expanded TSS query options

Resolves https://jira.appcelerator.org/browse/ALOY-1092 and https://jira.appcelerator.org/browse/ALOY-1037