Fixes generic ref/unref issue.
Fixes Searchable set issue