Make difference between feature using text and others

Fix bugs