Added matcher for entities fields
Fixed some typos