Minor cleanup of SearchesManager and related code