Ensure Staff threads do not incorrectly return staff replies to non-staff threads in search & recent history