Taxonomy SP: updates and fixes
Entity SP: work