[ALOY-1092] Expanded TSS query options