Remove conflicts in search and tooltip