Add and refactor analyzed fields for document models
Add trim filter to ES indices