TF-4644 Cover advanced search SSOT changes