Added LIKE implementation and fixed name matching