Fix more advanced search activity issues.