strfind can return empty which does not work well in logic test
More removal of SET references