diff --git a/client/actions/assignments/api.ts b/client/actions/assignments/api.ts
index bec65419c..8d00b041d 100644
--- a/client/actions/assignments/api.ts
+++ b/client/actions/assignments/api.ts
@@ -10,7 +10,7 @@ import * as actions from '../';
 import {ASSIGNMENTS, ALL_DESKS, SORT_DIRECTION} from '../../constants';
 import planningUtils from '../../utils/planning';
 import {getErrorMessage, isExistingItem, gettext} from '../../utils';
-import planning from '../planning';
+import planningActions from '../planning/api';
 import {assignmentsViewRequiresArchiveItems} from '../../components/Assignments/AssignmentItem/fields';
 
 const setBaseQuery = ({must = []}) => ({
@@ -415,7 +415,7 @@ const receiveAssignmentHistory = (items) => ({
  * @param {object} assignment - The Assignment to load items for
  */
 const loadPlanningAndEvent = (assignment) => (dispatch) =>
-    dispatch(planning.api.fetchById(assignment.planning_item));
+    dispatch(planningActions.fetchById(assignment.planning_item));
 
 /**
  * Loads the Archive items that are linked to the provided Assignment list
diff --git a/client/components/Assignments/AssignmentPreviewContainer/index.tsx b/client/components/Assignments/AssignmentPreviewContainer/index.tsx
index 16d944a5e..791d81ab4 100644
--- a/client/components/Assignments/AssignmentPreviewContainer/index.tsx
+++ b/client/components/Assignments/AssignmentPreviewContainer/index.tsx
@@ -16,6 +16,8 @@ import {
 import {superdeskApi} from '../../../superdeskApi';
 import * as selectors from '../../../selectors';
 import * as actions from '../../../actions';
+import planningActions from '../../../actions/planning/api';
+
 import {assignmentUtils, eventUtils, planningUtils, getFileDownloadURL} from '../../../utils';
 import {ASSIGNMENTS, WORKSPACE} from '../../../constants';
 
@@ -262,7 +264,7 @@ const mapDispatchToProps = (dispatch) => ({
     removeAssignment: (assignment) => dispatch(actions.assignments.ui.showRemoveAssignmentModal(assignment)),
     openArchivePreview: (assignment) => dispatch(actions.assignments.ui.openArchivePreview(assignment)),
     fetchEventFiles: (event) => dispatch(actions.events.api.fetchEventFiles(event)),
-    fetchPlanningFiles: (planning) => dispatch(actions.planning.api.fetchPlanningFiles(planning)),
+    fetchPlanningFiles: (planning) => dispatch(planningActions.fetchPlanningFiles(planning)),
 });
 
 export const AssignmentPreviewContainer = connect<IStateProps, IDispatchProps>(
diff --git a/client/components/Coverages/CoverageArrayInput.tsx b/client/components/Coverages/CoverageArrayInput.tsx
index 82cf285a0..cac903e8e 100644
--- a/client/components/Coverages/CoverageArrayInput.tsx
+++ b/client/components/Coverages/CoverageArrayInput.tsx
@@ -4,6 +4,7 @@ import {isEmpty} from 'lodash';
 
 import {
     EDITOR_TYPE,
+    IAssignmentItem,
     IAssignmentPriority,
     ICoverageFormProfile,
     ICoverageProvider, ICoverageScheduledUpdate, IEventItem, IFile,
@@ -22,6 +23,7 @@ import * as selectors from '../../selectors';
 import {InputArray} from '../UI/Form';
 import {CoverageEditor} from './CoverageEditor';
 import {CoverageAddButton} from './CoverageAddButton';
+import * as actions from '../../actions';
 
 
 interface IProps {
@@ -78,12 +80,7 @@ interface IProps {
         scheduledUpdate?: ICoverageScheduledUpdate,
         scheduledUpdateIndex?: number
     ): void;
-    onRemoveAssignment(
-        coverage: IPlanningCoverageItem,
-        index: number,
-        scheduledUpdate?: ICoverageScheduledUpdate,
-        scheduledUpdateIndex?: number
-    ): void;
+    onRemoveAssignment(assignemnt: IAssignmentItem): Promise<void>;
     uploadFiles(files: Array<Array<File>>): Promise<Array<IFile>>;
     notifyValidationErrors(errors: Array<string>): void;
 }
@@ -106,6 +103,10 @@ const mapStateToProps = (state) => ({
     defaultDesk: selectors.general.defaultDesk(state),
 });
 
+const mapDispatchToProps = (dispatch) => ({
+    onRemoveAssignment: (assignment) => dispatch(actions.assignments.ui.showRemoveAssignmentModal(assignment)),
+});
+
 class CoverageArrayInputComponent extends React.Component<IProps, IState> {
     constructor(props) {
         super(props);
@@ -214,6 +215,7 @@ class CoverageArrayInputComponent extends React.Component<IProps, IState> {
                 onChange={onChange}
                 addButtonText={addButtonText}
                 addButtonComponent={CoverageAddButton}
+                onRemoveAssignment={this.props.onRemoveAssignment}
                 addButtonProps={{
                     contentTypes,
                     defaultDesk,
@@ -260,4 +262,4 @@ class CoverageArrayInputComponent extends React.Component<IProps, IState> {
     }
 }
 
-export const CoverageArrayInput = connect(mapStateToProps)(CoverageArrayInputComponent);
+export const CoverageArrayInput = connect(mapStateToProps, mapDispatchToProps)(CoverageArrayInputComponent);
diff --git a/client/components/Coverages/CoverageEditor/CoverageFormHeader.tsx b/client/components/Coverages/CoverageEditor/CoverageFormHeader.tsx
index 26c534fb3..11b971be9 100644
--- a/client/components/Coverages/CoverageEditor/CoverageFormHeader.tsx
+++ b/client/components/Coverages/CoverageEditor/CoverageFormHeader.tsx
@@ -2,15 +2,18 @@ import React from 'react';
 import {connect} from 'react-redux';
 import {get} from 'lodash';
 
-import {IPlanningCoverageItem, ICoverageScheduledUpdate} from '../../../interfaces';
+import {IPlanningCoverageItem, ICoverageScheduledUpdate, ILockedItems} from '../../../interfaces';
 import {IArticle, IDesk, IUser} from 'superdesk-api';
 
-import {getCreator, getItemInArrayById, gettext, planningUtils, onEventCapture} from '../../../utils';
+import {getCreator, getItemInArrayById, gettext, onEventCapture} from '../../../utils';
 import {Item, Border, Column, Row as ListRow} from '../../UI/List';
-import {Button} from '../../UI';
 import {UserAvatar} from '../../../components/UserAvatar';
 import {StateLabel} from '../../StateLabel';
 import * as actions from '../../../actions';
+import {ASSIGNMENTS} from '../../../constants/assignments';
+import * as selectors from '../../../selectors';
+import {planningUtils} from '../../../utils';
+import {Button} from 'superdesk-ui-framework/react';
 
 interface IProps {
     field: string;
@@ -21,7 +24,7 @@ interface IProps {
     addNewsItemToPlanning?: IArticle;
     onChange(field: string, value: any): void;
     onFocus?(): void;
-    onRemoveAssignment?(): void;
+    onRemoveAssignment?(): Promise<void>;
     setCoverageDefaultDesk(coverage: IPlanningCoverageItem | ICoverageScheduledUpdate): void;
     showEditCoverageAssignmentModal(props: {
         field: string;
@@ -32,6 +35,7 @@ interface IProps {
         onChange(field: string, value: any): void;
         setCoverageDefaultDesk(coverage: IPlanningCoverageItem | ICoverageScheduledUpdate): void;
     }): void;
+    lockedItems: ILockedItems;
 }
 
 const mapDispatchToProps = (dispatch) => ({
@@ -40,6 +44,10 @@ const mapDispatchToProps = (dispatch) => ({
     ),
 });
 
+const mapStateToProps = (state) => ({
+    lockedItems: selectors.locks.getLockedItems(state),
+});
+
 export class CoverageFormHeaderComponent extends React.PureComponent<IProps> {
     constructor(props) {
         super(props);
@@ -69,15 +77,24 @@ export class CoverageFormHeaderComponent extends React.PureComponent<IProps> {
             addNewsItemToPlanning,
             onRemoveAssignment,
             readOnly,
+            lockedItems,
         } = this.props;
 
         const userAssigned = getCreator(value, 'assigned_to.user', users);
-        const deskAssigned = getItemInArrayById(desks, get(value, 'assigned_to.desk'));
-        const coverageProvider = get(value, 'assigned_to.coverage_provider');
-        const assignmentState = get(value, 'assigned_to.state');
-        const cancelled = get(value, 'workflow_status') === 'cancelled';
-        const canEditAssignment = planningUtils.isCoverageDraft(value) ||
-            (!!addNewsItemToPlanning && !get(value, 'coverage_id') && !get(value, 'scheduled_update_id'));
+        const deskAssigned = getItemInArrayById(desks, value.assigned_to?.desk);
+        const coverageProvider = value.assigned_to?.coverage_provider;
+        const assignmentState = value.assigned_to?.state;
+        const cancelled = value.workflow_status === ASSIGNMENTS.WORKFLOW_STATE.CANCELLED;
+
+        /*
+            Check if:
+            1. This view is rendered from AddToPlanning action
+            2. There's an already scheduled update for the coverage
+        */
+        const isAssignmentLocked = lockedItems?.assignment
+            && value.assigned_to?.assignment_id in lockedItems.assignment;
+        const canEditAssignment = addNewsItemToPlanning == null && !isAssignmentLocked
+            && !((value as ICoverageScheduledUpdate).scheduled_update_id);
 
         if (!deskAssigned && (!userAssigned || !coverageProvider)) {
             return (
@@ -102,11 +119,9 @@ export class CoverageFormHeaderComponent extends React.PureComponent<IProps> {
                                 <Button
                                     id="editAssignment"
                                     text={gettext('Assign')}
-                                    tabIndex={0}
-                                    enterKeyIsClick
-                                    className="btn btn--primary btn--small"
                                     onClick={this.showAssignmentModal}
-                                    autoFocus
+                                    size="small"
+                                    type="primary"
                                 />
                             </ListRow>
                         )}
@@ -130,7 +145,7 @@ export class CoverageFormHeaderComponent extends React.PureComponent<IProps> {
                             <span className="sd-list-item__text-label sd-list-item__text-label--normal">
                                 {gettext('Desk:')}
                             </span>
-                            <span name={`${field}.assigned_to.desk`}>
+                            <span key={`${field}.assigned_to.desk`}>
                                 {get(deskAssigned, 'name', '')}
                             </span>
                         </span>
@@ -141,7 +156,7 @@ export class CoverageFormHeaderComponent extends React.PureComponent<IProps> {
                                 <span className="sd-list-item__text-label sd-list-item__text-label--normal">
                                     {gettext('Assignee:')}
                                 </span>
-                                <span name={`${field}.assigned_to.user`}>
+                                <span key={`${field}.assigned_to.user`}>
                                     {get(userAssigned, 'display_name', '')}
                                 </span>
                             </span>
@@ -173,24 +188,22 @@ export class CoverageFormHeaderComponent extends React.PureComponent<IProps> {
                         <ListRow>
                             <Button
                                 text={gettext('Reassign')}
-                                className="btn btn--hollow btn--small"
                                 onClick={this.showAssignmentModal}
-                                tabIndex={0}
-                                enterKeyIsClick
-                                disabled={!!addNewsItemToPlanning}
-                                autoFocus
+                                style="hollow"
+                                size="small"
+                                expand
                             />
                         </ListRow>
-                        {!onRemoveAssignment ? null : (
+                        {onRemoveAssignment != null && (
                             <ListRow>
                                 <Button
                                     text={gettext('Remove')}
-                                    className="btn btn--hollow btn--small"
-                                    onClick={onRemoveAssignment}
-                                    tabIndex={0}
-                                    enterKeyIsClick
-                                    disabled={!!addNewsItemToPlanning}
-                                    autoFocus
+                                    onClick={() => {
+                                        onRemoveAssignment();
+                                    }}
+                                    style="hollow"
+                                    size="small"
+                                    expand
                                 />
                             </ListRow>
                         )}
@@ -202,6 +215,6 @@ export class CoverageFormHeaderComponent extends React.PureComponent<IProps> {
 }
 
 export const CoverageFormHeader = connect(
-    null,
+    mapStateToProps,
     mapDispatchToProps
 )(CoverageFormHeaderComponent);
diff --git a/client/components/Coverages/CoverageEditor/index.tsx b/client/components/Coverages/CoverageEditor/index.tsx
index e9b0e9d61..c6b2b639b 100644
--- a/client/components/Coverages/CoverageEditor/index.tsx
+++ b/client/components/Coverages/CoverageEditor/index.tsx
@@ -56,7 +56,7 @@ interface IProps {
     onDuplicateCoverage(coverage: DeepPartial<IPlanningCoverageItem>, duplicateAs?: IG2ContentType['qcode']): void;
     onCancelCoverage?(): void;
     onAddCoverageToWorkflow?(): void;
-    onRemoveAssignment?(): void;
+    onRemoveAssignment?(coverage: IPlanningCoverageItem): void;
     popupContainer(): void;
     setCoverageDefaultDesk(): void;
     onPopupOpen(): void;
diff --git a/client/components/Coverages/CoverageIcons.tsx b/client/components/Coverages/CoverageIcons.tsx
index 08386ef01..222465275 100644
--- a/client/components/Coverages/CoverageIcons.tsx
+++ b/client/components/Coverages/CoverageIcons.tsx
@@ -74,13 +74,15 @@ export function getAvatarForCoverage(
 
         return placeholder;
     } else {
+        const statusDotColor = planningUtils.getNewsCoverageStatusDotColor(coverage);
+
         const avatar: Omit<IPropsAvatar, 'size'> = {
             initials: getUserInitials(user.display_name),
             imageUrl: user.picture_url,
             displayName: user.display_name,
             icon: icon,
             customContent: getCustomAvatarContent(user),
-            statusDot: {color: planningUtils.getNewsCoverageStatusDotColor(coverage)},
+            statusDot: statusDotColor != null ? {color: statusDotColor} : null,
         };
 
         return avatar;
diff --git a/client/components/Planning/PlanningEditor/index.tsx b/client/components/Planning/PlanningEditor/index.tsx
index 1bc2587dc..8e5d3e887 100644
--- a/client/components/Planning/PlanningEditor/index.tsx
+++ b/client/components/Planning/PlanningEditor/index.tsx
@@ -27,6 +27,7 @@ import {planningUtils, eventUtils, lockUtils} from '../../../utils';
 import {EditorForm} from '../../Editor/EditorForm';
 import {PlanningEditorHeader} from './PlanningEditorHeader';
 import {COVERAGES} from '../../../constants';
+import planningActions from '../../../actions/planning/api';
 
 interface IProps {
     original?: IPlanningItem;
@@ -99,9 +100,9 @@ const mapStateToProps = (state) => ({
 
 const mapDispatchToProps = (dispatch) => ({
     fetchEventFiles: (event) => dispatch(actions.events.api.fetchEventFiles(event)),
-    fetchPlanningFiles: (planning) => dispatch(actions.planning.api.fetchPlanningFiles(planning)),
-    uploadFiles: (files) => dispatch(actions.planning.api.uploadFiles({files: files})),
-    removeFile: (file) => dispatch(actions.planning.api.removeFile(file)),
+    fetchPlanningFiles: (planning) => dispatch(planningActions.fetchPlanningFiles(planning)),
+    uploadFiles: (files) => dispatch(planningActions.uploadFiles({files: files})),
+    removeFile: (file) => dispatch(planningActions.removeFile(file)),
     setCoverageDefaultDesk: (coverage) => dispatch(actions.users.setCoverageDefaultDesk(coverage)),
     setCoverageAddAdvancedMode: (advancedMode) => dispatch(actions.users.setCoverageAddAdvancedMode(advancedMode)),
 });
diff --git a/client/components/Planning/PlanningPreviewContent.tsx b/client/components/Planning/PlanningPreviewContent.tsx
index 5a8115ca6..9f75ed665 100644
--- a/client/components/Planning/PlanningPreviewContent.tsx
+++ b/client/components/Planning/PlanningPreviewContent.tsx
@@ -19,6 +19,7 @@ import {eventUtils, getCreator, getFileDownloadURL} from '../../utils';
 import {getUserInterfaceLanguageFromCV} from '../../utils/users';
 import * as selectors from '../../selectors';
 import * as actions from '../../actions';
+import planningActions from '../../actions/planning/api';
 
 import {
     AuditInformation,
@@ -83,7 +84,7 @@ const mapStateToProps = (state, ownProps): IReduxProps => ({
 const mapDispatchToProps = (dispatch): IDispatchProps => ({
     onEditEvent: (event) => dispatch(actions.main.openForEdit(event)),
     fetchEventFiles: (event) => dispatch(actions.events.api.fetchEventFiles(event)),
-    fetchPlanningFiles: (planning) => dispatch(actions.planning.api.fetchPlanningFiles(planning)),
+    fetchPlanningFiles: (planning) => dispatch(planningActions.fetchPlanningFiles(planning)),
 });
 
 export class PlanningPreviewContentComponent extends React.PureComponent<IProps> {
diff --git a/client/components/UI/Button.tsx b/client/components/UI/Button.tsx
index 6033869c3..e8d84d6c4 100644
--- a/client/components/UI/Button.tsx
+++ b/client/components/UI/Button.tsx
@@ -1,41 +1,60 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import classNames from 'classnames';
 
 import {KEYCODES} from './constants';
 import {onEventCapture} from './utils';
 
 
-/**
- * @ngdoc react
- * @name Button
- * @description Generic Button component
- */
+interface IButtonProps {
+    id?: string;
+    className?: string;
+    onClick: (...args: any) => any;
+    icon?: string;
+    title?: string;
+    text?: string;
+    disabled?: boolean;
+    textOnly?: boolean;
+    hollow?: boolean;
+    iconOnly?: boolean;
+    expanded?: boolean;
+    color?: 'primary' | 'success' | 'warning' | 'alert' | 'highlight' | 'sd-green' | 'ui-dark' | 'default';
+    size?: 'small' | 'large';
+    tabIndex?: number;
+    enterKeyIsClick?: boolean;
+    autoFocus?: boolean;
+    onKeyDown?: (e: React.KeyboardEvent) => any;
+    refNode?: (...args: any) => any;
+    iconOnlyCircle?: boolean;
+    children?: React.ReactNode;
+    pullRight?: boolean;
+    empty?: boolean;
+}
+
 const Button = ({
+    disabled = false,
+    textOnly = false,
+    hollow = false,
+    expanded = false,
+    enterKeyIsClick = false,
+    autoFocus = false,
+    iconOnlyCircle = false,
+    pullRight = false,
+    empty = false,
     className,
     onClick,
     icon,
     id,
     title,
     text,
-    disabled,
-    textOnly,
-    hollow,
-    expanded,
     color,
     size,
     iconOnly,
     tabIndex,
-    enterKeyIsClick,
-    autoFocus,
     refNode,
     onKeyDown,
-    iconOnlyCircle,
     children,
-    pullRight,
-    empty,
     ...props
-}) => {
+}: IButtonProps) => {
     const handeKeyDown = (event) => {
         if (event.keyCode === KEYCODES.ENTER) {
             onEventCapture(event);
@@ -82,42 +101,4 @@ const Button = ({
     );
 };
 
-Button.propTypes = {
-    id: PropTypes.string,
-    className: PropTypes.string,
-    onClick: PropTypes.func.isRequired,
-    icon: PropTypes.string,
-    title: PropTypes.string,
-    text: PropTypes.string,
-    disabled: PropTypes.bool,
-    textOnly: PropTypes.bool,
-    hollow: PropTypes.bool,
-    iconOnly: PropTypes.bool,
-    expanded: PropTypes.bool,
-    color: PropTypes.oneOf(['primary', 'success', 'warning', 'alert', 'highlight', 'sd-green', 'ui-dark', 'default']),
-    size: PropTypes.oneOf(['small', 'large']),
-    tabIndex: PropTypes.number,
-    enterKeyIsClick: PropTypes.bool,
-    autoFocus: PropTypes.bool,
-    onKeyDown: PropTypes.func,
-    refNode: PropTypes.func,
-    iconOnlyCircle: PropTypes.bool,
-    children: PropTypes.node,
-    pullRight: PropTypes.bool,
-    empty: PropTypes.bool,
-};
-
-Button.defaultProps = {
-    disabled: false,
-    textOnly: false,
-    hollow: false,
-    iconOnly: false,
-    expanded: false,
-    enterKeyIsClick: false,
-    autoFocus: false,
-    iconOnlyCircle: false,
-    pullRight: false,
-    empty: false,
-};
-
 export default Button;
diff --git a/client/components/UI/Form/InputArray/index.tsx b/client/components/UI/Form/InputArray/index.tsx
index a0572fa65..d7e634720 100644
--- a/client/components/UI/Form/InputArray/index.tsx
+++ b/client/components/UI/Form/InputArray/index.tsx
@@ -7,6 +7,15 @@ import {Button} from '../../';
 import {Row, LineInput} from '../';
 import './style.scss';
 import {superdeskApi} from '../../../../superdeskApi';
+import {planningApis} from '../../../../api';
+import {
+    EDITOR_TYPE,
+    IAssignmentItem,
+    IG2ContentType,
+    IPlanningCoverageItem,
+    IPlanningNewsCoverageStatus,
+} from 'interfaces';
+import {IDesk} from 'superdesk-api';
 
 interface IProps {
     field: string;
@@ -18,7 +27,7 @@ interface IProps {
     maxCount: number;
     addOnly: boolean;
     originalCount: number;
-    element: React.ComponentClass;
+    element: React.ComponentClass<any>;
     defaultElement: any;
     readOnly: boolean;
     message: any;
@@ -37,8 +46,19 @@ interface IProps {
     errors: {[key: string]: any};
     showErrors: boolean;
     testId?: string;
-
+    onRemoveAssignment: (assignment: IAssignmentItem) => Promise<void>;
     getRef?(field: string, value: any): React.RefObject<any>;
+    popupContainer(): HTMLElement;
+    onPopupOpen(): void;
+    onPopupClose(): void;
+    setCoverageDefaultDesk(coverage: IPlanningCoverageItem): void;
+    contentTypes: Array<IG2ContentType>;
+    defaultDesk: IDesk;
+    newsCoverageStatus: Array<IPlanningNewsCoverageStatus>;
+    navigation: any;
+    openCoverageIds: Array<string>;
+    preferredCoverageDesks: {[key: string]: string};
+    editorType: EDITOR_TYPE;
 }
 
 export class InputArray extends React.PureComponent<IProps> {
@@ -153,6 +173,10 @@ export class InputArray extends React.PureComponent<IProps> {
                 {(value || []).map((val, index) => (
                     <Component
                         {...props}
+                        onRemoveAssignment={(val) =>
+                            planningApis.assignments.getById(val.assigned_to.assignment_id)
+                                .then((assignment) => this.props.onRemoveAssignment(assignment))
+                        }
                         key={index}
                         ref={this.props.getRef == null ? null : this.props.getRef(field, val)}
                         testId={`${testId}[${index}]`}
diff --git a/client/components/fields/editor/CustomVocabularies.tsx b/client/components/fields/editor/CustomVocabularies.tsx
index e33c5bc1e..927dae8b8 100644
--- a/client/components/fields/editor/CustomVocabularies.tsx
+++ b/client/components/fields/editor/CustomVocabularies.tsx
@@ -5,8 +5,9 @@ import {ISubject, IVocabulary} from 'superdesk-api';
 import {superdeskApi} from '../../../superdeskApi';
 import {IEditorFieldProps, IProfileSchemaTypeList} from '../../../interfaces';
 import {Row} from '../../UI/Form';
-import {getVocabularyItemNameFromString} from '../../../utils/vocabularies';
-import {EditorFieldTreeSelect} from '../editor/base/treeSelect';
+import {getVocabularyItemFieldTranslated} from '../../../utils/vocabularies';
+import {arrayToTree} from 'superdesk-core/scripts/core/helpers/tree';
+import {TreeSelect} from 'superdesk-ui-framework/react';
 
 interface IProps extends IEditorFieldProps {
     schema?: IProfileSchemaTypeList;
@@ -33,6 +34,8 @@ class CustomVocabulariesComponent extends React.PureComponent<IProps> {
             required,
             testId,
             language,
+            disabled,
+            invalid,
         } = this.props;
 
         const customVocabularies = vocabularies.filter((cv) =>
@@ -41,7 +44,7 @@ class CustomVocabulariesComponent extends React.PureComponent<IProps> {
 
         return customVocabularies.map((cv) => {
             const cvFieldName = `custom_vocabularies.${cv._id}`;
-            const parentField = cv.schema_field || 'subject';
+            const itemFieldName = cv.schema_field ?? 'subject';
 
             return (
                 <Row
@@ -49,35 +52,41 @@ class CustomVocabulariesComponent extends React.PureComponent<IProps> {
                     id={`form-row-${cvFieldName}`}
                     data-test-id={testId?.length ? `${testId}.${cv._id}` : cv._id}
                 >
-                    <EditorFieldTreeSelect
-                        filterScheme={(values) => values.filter((value) => cv._id == null || value?.scheme === cv._id)}
-                        item={item}
-                        field={parentField}
-                        label={gettext(cv.display_name)}
-                        required={required || schema?.required}
-                        allowMultiple={true}
+                    <TreeSelect
                         sortable={true}
-                        getOptions={() => cv.items.map((item: ISubject) => ({value: {...item, scheme: cv._id}}))}
-                        getId={(item: ISubject) => item.qcode}
-                        getLabel={(item: ISubject) => (
-                            getVocabularyItemNameFromString(
-                                item.qcode,
-                                cv.items,
-                                'qcode',
-                                'name',
-                                language
-                            )
+                        kind="synchronous"
+                        allowMultiple={true}
+                        value={(item.subject ?? []).filter((x) => x.scheme === cv._id)}
+                        label={gettext(cv.display_name)}
+                        required={required ?? schema?.required}
+                        getOptions={() => arrayToTree(
+                            cv.items.map((cvItem) => ({
+                                ...cvItem,
+                                scheme: cv._id,
+                            })) as Array<ISubject>,
+                            ({qcode}) => qcode.toString(),
+                            ({parent}) => parent?.toString(),
+                        ).result}
+                        getLabel={(item) => getVocabularyItemFieldTranslated(
+                            item,
+                            'name',
+                            language,
                         )}
-                        onChange={(field, value) => {
-                            const otherCvValues = item[parentField] ?? [];
+                        getId={(item) => item.qcode}
+                        invalid={errors?.length > 0 || invalid}
+                        error={showErrors ? errors[itemFieldName] : undefined}
+                        readOnly={disabled}
+                        disabled={disabled}
+                        onChange={(vals) => {
+                            const restOfItems = (item.subject ?? []).filter((x) => x.scheme !== cv._id);
 
-                            const newValues = value.concat(
-                                otherCvValues.filter((value) => value?.scheme != cv._id)
+                            onChange(
+                                'subject',
+                                [...restOfItems, ...vals],
                             );
-
-                            onChange(field, newValues);
                         }}
-                        errors={errors}
+                        tabindex={0}
+                        zIndex={1051}
                     />
                 </Row>
             );
diff --git a/client/controllers/AddToPlanningController.tsx b/client/controllers/AddToPlanningController.tsx
index 90675f800..0ff631dd3 100644
--- a/client/controllers/AddToPlanningController.tsx
+++ b/client/controllers/AddToPlanningController.tsx
@@ -5,11 +5,12 @@ import ReactDOM from 'react-dom';
 import {Provider} from 'react-redux';
 import {ModalsContainer} from '../components';
 import {planning} from '../actions';
-import {get, isEmpty, isNumber} from 'lodash';
+import {get, isEmpty, isNumber, noop} from 'lodash';
 import {registerNotifications, getErrorMessage, isExistingItem} from '../utils';
 import {WORKSPACE, MODALS} from '../constants';
 import {GET_LABEL_MAP} from 'superdesk-core/scripts/apps/workspace/content/constants';
 import {IArticle, IContentProfile} from 'superdesk-api';
+import {authoringReactViewEnabled} from 'appConfig';
 import {planningApi, superdeskApi} from '../superdeskApi';
 import {PLANNING_VIEW} from '../interfaces';
 
@@ -87,7 +88,7 @@ export class AddToPlanningController {
         return sdPlanningStore.initWorkspace(WORKSPACE.AUTHORING, this.loadWorkspace)
             .then(
                 this.render,
-                this.$scope.resolve
+                !authoringReactViewEnabled ? this.$scope.resolve : noop
             );
     }
 
@@ -190,7 +191,9 @@ export class AddToPlanningController {
             this.store.dispatch(actions.resetStore());
 
             if (this.superdeskFlags.flags.authoring || !this.rendered) {
-                this.$scope.resolve();
+                if (!authoringReactViewEnabled) {
+                    this.$scope.resolve();
+                }
                 return;
             }
 
@@ -205,7 +208,9 @@ export class AddToPlanningController {
                         body: this.gettext('The item was unlocked by "{{ username }}"', {username}),
                         action: () => {
                             this.newsItem.lock_session = null;
-                            this.$scope.resolve();
+                            if (!authoringReactViewEnabled) {
+                                this.$scope.resolve();
+                            }
                         },
                     },
                 })));
@@ -263,7 +268,9 @@ export class AddToPlanningController {
                         this.notify.error(err);
                     });
 
-                    this.$scope.resolve('foo');
+                    if (!authoringReactViewEnabled) {
+                        this.$scope.resolve('foo');
+                    }
                     return Promise.reject('foo');
                 }
 
@@ -271,7 +278,9 @@ export class AddToPlanningController {
                     this.notify.error(
                         this.gettext('Item already locked.')
                     );
-                    this.$scope.resolve('bar');
+                    if (!authoringReactViewEnabled) {
+                        this.$scope.resolve('bar');
+                    }
                     return Promise.reject('bar');
                 }
 
@@ -284,13 +293,23 @@ export class AddToPlanningController {
                                 this.notify.error(
                                     getErrorMessage(error, this.gettext('Failed to lock the item.'))
                                 );
-                                this.$scope.resolve(error);
+                                if (!authoringReactViewEnabled) {
+                                    this.$scope.resolve(error);
+                                }
                                 return Promise.reject(error);
                             }
                         );
                 }
 
                 return Promise.resolve(newsItem);
+            }, (error) => {
+                this.notify.error(
+                    getErrorMessage(error, this.gettext('Failed to load the item.'))
+                );
+                if (!authoringReactViewEnabled) {
+                    this.$scope.resolve(error);
+                }
+                return Promise.reject(error);
             });
     }
 }
diff --git a/client/controllers/FulfilAssignmentController.tsx b/client/controllers/FulfilAssignmentController.tsx
index e8bcb63a1..5077e6822 100644
--- a/client/controllers/FulfilAssignmentController.tsx
+++ b/client/controllers/FulfilAssignmentController.tsx
@@ -3,12 +3,31 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import {Provider} from 'react-redux';
 import {ModalsContainer} from '../components';
-import {get} from 'lodash';
 import {registerNotifications} from '../utils';
 import {WORKSPACE, MODALS, ASSIGNMENTS} from '../constants';
 import {getErrorMessage} from '../utils/index';
+import {IArticle} from 'superdesk-api';
 
 export class FulFilAssignmentController {
+    item: IArticle;
+    notify: {error: (message: string) => void};
+    gettext: (
+        value: string,
+        params?: {[placeholder: string]: string | number | React.ComponentType},
+    ) => string;
+    $scope: any;
+    store: any;
+    newsItem: any;
+    rendered: boolean;
+    $timeout: any;
+    lock: any;
+    $element: any;
+    session: any;
+    superdeskFlags: any;
+    userList: any;
+    api: any;
+    desks: any;
+
     constructor(
         $element,
         $scope,
@@ -43,20 +62,18 @@ export class FulFilAssignmentController {
 
         this.store = null;
         this.newsItem = null;
-        this.item = get($scope, 'locals.data.item', {});
+        this.item = $scope.locals?.data.item ?? {};
         this.rendered = false;
 
         $scope.$on('$destroy', this.onDestroy);
         $scope.$on('item:unlock', this.onItemUnlock);
 
-        if (get(this.item, 'archive_item')) { // use archive item for published
+        if (this.item?.archive_item) { // use archive item for published
             this.item = this.item.archive_item;
         }
 
-        if (get(this.item, 'slugline', '') === '') {
-            this.notify.error(
-                this.gettext('[SLUGLINE] is a required field')
-            );
+        if (!this.item?.slugline) {
+            this.notify.error(this.gettext('[SLUGLINE] is a required field'));
             this.$scope.resolve();
             return;
         }
@@ -92,7 +109,7 @@ export class FulFilAssignmentController {
         return Promise.resolve();
     }
 
-    loadWorkspace(store, workspaceChanged) {
+    loadWorkspace(store) {
         this.store = store;
 
         return this.loadArchiveItem()
@@ -120,15 +137,15 @@ export class FulFilAssignmentController {
             }, 1000);
 
             // Only unlock the item if it was locked when launching this modal
-            if (get(this.newsItem, 'lock_session', null) !== null &&
-                get(this.newsItem, 'lock_action', 'edit') === 'fulfil_assignment' &&
-                this.lock.isLockedInCurrentSession(this.newsItem)
+            if (this.newsItem?.lock_session != null
+                && (this.newsItem.lock_action ?? 'edit') === 'fulfil_assignment'
+                && this.lock.isLockedInCurrentSession(this.newsItem)
             ) {
                 this.lock.unlock(this.newsItem);
             }
 
             // update the scope item.
-            if (this.item && get(this.newsItem, 'assignment_id')) {
+            if (this.item && this.newsItem?.assignment_id) {
                 this.item.assignment_id = this.newsItem.assignment_id;
             }
         }
@@ -170,51 +187,42 @@ export class FulFilAssignmentController {
     }
 
     loadArchiveItem() {
-        return this.api.find('archive', this.item._id)
-            .then((newsItem) => {
-                if (get(newsItem, 'assignment_id')) {
-                    this.notify.error(
-                        this.gettext('Item already linked to a Planning item')
-                    );
-                    this.$scope.resolve();
-                    return Promise.reject();
-                }
+        return this.api.find('archive', this.item._id).then((newsItem) => {
+            if (newsItem?.assignment_id) {
+                this.notify.error(this.gettext('Item already linked to a Planning item'));
+                this.$scope.resolve();
+                return Promise.reject();
+            }
 
-                if (this.lock.isLocked(newsItem)) {
-                    this.notify.error(
-                        this.gettext('Item already locked.')
+            if (this.lock.isLocked(newsItem)) {
+                this.notify.error(this.gettext('Item already locked.'));
+                this.$scope.resolve();
+                return Promise.reject();
+            }
+
+            if (!this.lock.isLockedInCurrentSession(newsItem)) {
+                newsItem._editable = true;
+                return this.lock.lock(newsItem, false, 'fulfil_assignment')
+                    .then(
+                        (lockedItem) => Promise.resolve(lockedItem),
+                        (error) => {
+                            this.notify.error(
+                                this.gettext(getErrorMessage(error, 'Failed to lock the item.'))
+                            );
+                            this.$scope.resolve(error);
+                            return Promise.reject(error);
+                        }
                     );
-                    this.$scope.resolve();
-                    return Promise.reject();
-                }
-
-                if (!this.lock.isLockedInCurrentSession(newsItem)) {
-                    newsItem._editable = true;
-                    return this.lock.lock(newsItem, false, 'fulfil_assignment')
-                        .then(
-                            (lockedItem) => Promise.resolve(lockedItem),
-                            (error) => {
-                                this.notify.error(
-                                    this.gettext(
-                                        getErrorMessage(error, 'Failed to lock the item.')
-                                    )
-                                );
-                                this.$scope.resolve(error);
-                                return Promise.reject(error);
-                            }
-                        );
-                }
-
-                return Promise.resolve(newsItem);
-            }, (error) => {
-                this.notify.error(
-                    this.gettext(
-                        getErrorMessage(error, 'Failed to load the item.')
-                    )
-                );
-                this.$scope.resolve(error);
-                return Promise.reject(error);
-            });
+            }
+
+            return Promise.resolve(newsItem);
+        }, (error) => {
+            this.notify.error(
+                this.gettext(getErrorMessage(error, 'Failed to load the item.'))
+            );
+            this.$scope.resolve(error);
+            return Promise.reject(error);
+        });
     }
 }
 
diff --git a/client/extension_bridge.ts b/client/extension_bridge.ts
index 281799d71..4f26a9c3f 100644
--- a/client/extension_bridge.ts
+++ b/client/extension_bridge.ts
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import {IVocabularyItem} from 'superdesk-api';
+import {IArticle, IVocabularyItem} from 'superdesk-api';
 
 import {getAssignmentTypeInfo} from './utils/assignments';
 import {SluglineComponent} from './components/Assignments/AssignmentItem/fields/Slugline';
@@ -13,6 +13,7 @@ import {getUserInterfaceLanguageFromCV} from './utils/users';
 
 import {registerEditorField} from './components/fields/resources/registerEditorFields';
 import {IAssignmentItem, IEditorFieldProps, IPlanningAppState, IPlanningItem} from 'interfaces';
+import {isContentLinkToCoverageAllowed} from './utils/archive';
 
 import PlanningDetailsWidget, {getItemPlanningInfo} from './components/PlanningDetailsWidget';
 
@@ -20,6 +21,7 @@ import PlanningDetailsWidget, {getItemPlanningInfo} from './components/PlanningD
 interface IExtensionBridge {
     assignments: {
         utils: {
+            isContentLinkToCoverageAllowed(item: IArticle): boolean;
             getAssignmentTypeInfo(
                 assignment: IAssignmentItem,
                 contentTypes: Array<IVocabularyItem>,
@@ -46,6 +48,7 @@ interface IExtensionBridge {
                 language?: string,
                 fallbackField?: string
             ): string;
+            isContentLinkToCoverageAllowed(item: IArticle): boolean;
         };
 
         components: {
@@ -74,6 +77,7 @@ export const extensionBridge: IExtensionBridge = {
     assignments: {
         utils: {
             getAssignmentTypeInfo,
+            isContentLinkToCoverageAllowed,
         },
         components: {
             SluglineComponent,
@@ -88,6 +92,7 @@ export const extensionBridge: IExtensionBridge = {
         utils: {
             getUserInterfaceLanguageFromCV,
             getVocabularyItemFieldTranslated,
+            isContentLinkToCoverageAllowed,
         },
         components: {
             EditorFieldVocabulary,
diff --git a/client/planning-extension/src/assignments-overview/hiddenAssignmentsList.tsx b/client/planning-extension/src/assignments-overview/hiddenAssignmentsList.tsx
new file mode 100644
index 000000000..1b4bf6b86
--- /dev/null
+++ b/client/planning-extension/src/assignments-overview/hiddenAssignmentsList.tsx
@@ -0,0 +1,58 @@
+import * as React from 'react';
+import {IUser} from 'superdesk-api';
+import {getAssignmentsQuery} from '.';
+import {ASSIGNMENT_STATE, IAssignmentItem} from '../../../interfaces';
+import {superdesk} from '../superdesk';
+const {getLiveQueryHOC} = superdesk.components;
+const LiveAssignmentsHOC = getLiveQueryHOC<IAssignmentItem>();
+
+interface IState {
+    loading: false;
+    currentUser: IUser;
+}
+
+export class AssignmentsCountTracker extends React.PureComponent<{}, {loading: true} | IState> {
+    constructor(props: {}) {
+        super(props);
+
+        this.state = {loading: true};
+    }
+
+    componentDidMount() {
+        superdesk.session.getCurrentUser()
+            .then((currentUser) => {
+                this.setState({
+                    loading: false,
+                    currentUser: currentUser,
+                });
+            });
+    }
+
+    render() {
+        if (this.state.loading === true) {
+            return null;
+        }
+
+        const {currentUser} = this.state;
+
+        return (
+            <LiveAssignmentsHOC
+                resource="assignments"
+                query={getAssignmentsQuery(currentUser._id, [ASSIGNMENT_STATE.ASSIGNED])}
+            >
+                {
+                    (data) => {
+                        const itemsCount = data._meta.total;
+
+                        superdesk.dispatchEvent(
+                            'menuItemBadgeValueChange',
+                            {menuId: 'MENU_ITEM_PLANNING_ASSIGNMENTS', badgeValue: itemsCount.toString()},
+                        );
+
+                        return null;
+                    }
+                }
+            </LiveAssignmentsHOC>
+        );
+    }
+}
diff --git a/client/planning-extension/src/assignments-overview/index.tsx b/client/planning-extension/src/assignments-overview/index.tsx
index 95a52b9a7..280baae61 100644
--- a/client/planning-extension/src/assignments-overview/index.tsx
+++ b/client/planning-extension/src/assignments-overview/index.tsx
@@ -8,7 +8,7 @@ import {
     IUser,
     IVocabulary,
 } from 'superdesk-api';
-import {IAssignmentItem} from '../../../interfaces';
+import {ASSIGNMENT_STATE, IAssignmentItem} from '../../../interfaces';
 import {superdesk} from '../superdesk';
 import {Badge} from 'superdesk-ui-framework';
 import {AssignmentsOverviewListItem} from './assignments-overview-list-item';
@@ -27,16 +27,16 @@ interface IState {
     currentUser: IUser;
 }
 
-function getAssignmentsQuery(userId: IUser['_id']): ISuperdeskQuery {
+export function getAssignmentsQuery(userId: IUser['_id'], assignmentToState: Array<ASSIGNMENT_STATE>): ISuperdeskQuery {
     const query: ISuperdeskQuery = {
         filter: {
             $and: [
                 {'assigned_to.user': {$eq: userId}},
-                {'assigned_to.state': {$in: ['assigned', 'submitted', 'in_progress']}},
+                {'assigned_to.state': {$in: assignmentToState}},
             ],
         },
         sort: [{'planning.scheduled': 'asc'}],
-        page: 0,
+        page: 1,
         max_results: 100,
     };
 
@@ -68,7 +68,13 @@ export class AssignmentsList extends React.PureComponent<IProps, {loading: true}
         const {currentUser} = this.state;
 
         return (
-            <LiveAssignmentsHOC resource="assignments" query={getAssignmentsQuery(currentUser._id)}>
+            <LiveAssignmentsHOC
+                resource="assignments"
+                query={getAssignmentsQuery(
+                    currentUser._id,
+                    [ASSIGNMENT_STATE.ASSIGNED, ASSIGNMENT_STATE.SUBMITTED, ASSIGNMENT_STATE.IN_PROGRESS],
+                )}
+            >
                 {
                     (data) => {
                         const assignments = data._items;
diff --git a/client/planning-extension/src/extension.ts b/client/planning-extension/src/extension.ts
index 725fc371e..6a723a912 100644
--- a/client/planning-extension/src/extension.ts
+++ b/client/planning-extension/src/extension.ts
@@ -5,6 +5,7 @@ import {
     ISuperdesk,
     IExtensionActivationResult,
     onPublishMiddlewareResult,
+    IAuthoringAction,
 } from 'superdesk-api';
 import {IPlanningAssignmentService} from './interfaces';
 import {IPlanningConfig} from '../../interfaces';
@@ -19,6 +20,7 @@ import {
     PLANNING_DETAILS_WIDGET_ID,
     PLANNING_DETAILS_WIDGET_LABEL,
 } from './planning-details-widget';
+import {AssignmentsCountTracker} from './assignments-overview/hiddenAssignmentsList';
 
 function onSpike(superdesk: ISuperdesk, item: IArticle) {
     const {gettext} = superdesk.localization;
@@ -113,40 +115,104 @@ const extension: IExtension = {
         const displayTopbarWidget = superdesk.privileges.hasPrivilege('planning_assignments_view')
             && extensionConfig?.assignmentsTopBarWidget === true;
         const {gettext} = superdesk.localization;
-
+        const {article: superdeskArticleApi} = superdesk.entities;
+        const planningActionsGroupId = 'planning-actions';
         const {getItemPlanningInfo} = extensionBridge.planning;
+        const canAddToPlanning = (item: IArticle) => (
+            superdesk.privileges.hasPrivilege('planning_planning_management') &&
+            superdesk.privileges.hasPrivilege('archive') &&
+            !item.assignment_id != null &&
+            !superdesk.entities.article.isPersonal(item) &&
+            !superdesk.entities.article.isLockedInOtherSession(item) &&
+            item.state !== 'correction' &&
+            extensionBridge.ui.utils.isContentLinkToCoverageAllowed(item) &&
+            (
+                superdesk.entities.article.itemAction(item).edit ||
+                superdesk.entities.article.itemAction(item).correct ||
+                superdesk.entities.article.itemAction(item).deschedule
+            )
+        );
+        const canUnlinkAsCoverage = (item: IArticle) => (
+            superdesk.privileges.hasPrivilege('archive') &&
+            item.assignment_id != null &&
+            !superdeskArticleApi.isPersonal(item) &&
+            !superdeskArticleApi.isLockedInOtherSession(item) &&
+            (
+                superdeskArticleApi.itemAction(item).edit ||
+                superdeskArticleApi.itemAction(item).correct ||
+                superdeskArticleApi.itemAction(item).deschedule
+            )
+        );
+        const canFulfilAssignment = (item: IArticle) => {
+            const itemStates = ['killed', 'recalled', 'unpublished', 'spiked', 'correction'];
+            const {isContentLinkToCoverageAllowed} = extensionBridge.assignments.utils;
+
+            return (
+                !item.assignment_id &&
+                !superdesk.entities.article.isPersonal(item) &&
+                isContentLinkToCoverageAllowed(item) &&
+                !superdesk.entities.article.isLockedInOtherSession(item) &&
+                !itemStates.includes(item.state) &&
+                superdesk.privileges.hasPrivilege('archive')
+            );
+        };
+
+        const getPermittedActions = (item: IArticle) => {
+            const permittedActions: Array<IAuthoringAction> = [];
+
+            if (canAddToPlanning(item)) {
+                permittedActions.push({
+                    label: gettext('Add to Planning'),
+                    groupId: planningActionsGroupId,
+                    icon: 'calendar-list',
+                    onTrigger: () => {
+                        const customEvent = new CustomEvent('planning:addToPlanning', {detail: item});
+
+                        window.dispatchEvent(customEvent);
+                    },
+                });
+            }
+
+            if (canUnlinkAsCoverage(item)) {
+                permittedActions.push({
+                    label: gettext('Unlink as Coverage'),
+                    groupId: planningActionsGroupId,
+                    icon: 'cut',
+                    onTrigger: () => {
+                        superdesk.entities.article.get(item._id).then((_item) => {
+                            window.dispatchEvent(new CustomEvent(
+                                'planning:unlinkfromcoverage',
+                                {detail: {item: _item}},
+                            ));
+                        });
+                    },
+                });
+            }
+
+            if (canFulfilAssignment(item)) {
+                permittedActions.push({
+                    label: superdesk.localization.gettext('Fulfil assignment'),
+                    groupId: planningActionsGroupId,
+                    icon: 'calendar-list',
+                    onTrigger: () => {
+                        superdesk.entities.article.get(item._id).then((_item) => {
+                            window.dispatchEvent(new CustomEvent(
+                                'planning:fulfilassignment',
+                                {detail: {item: _item}},
+                            ));
+                        });
+                    },
+                });
+            }
+
+            return permittedActions;
+        };
 
         const result: IExtensionActivationResult = {
             contributions: {
                 entities: {
                     article: {
-                        getActions: (item) => [
-                            {
-                                label: gettext('Unlink as Coverage'),
-                                groupId: 'planning-actions',
-                                icon: 'cut',
-                                onTrigger: () => {
-                                    const superdeskArticle = superdesk.entities.article;
-
-                                    // keep in sync with client/planning-extension/src/extension.ts:123
-                                    if (
-                                        superdesk.privileges.hasPrivilege('archive') &&
-                                        item.assignment_id != null &&
-                                        !superdeskArticle.isPersonal(item) &&
-                                        !superdeskArticle.isLockedInOtherSession(item) &&
-                                        (
-                                            superdeskArticle.itemAction(item).edit ||
-                                            superdeskArticle.itemAction(item).correct ||
-                                            superdeskArticle.itemAction(item).deschedule
-                                        )
-                                    ) {
-                                        const event = new CustomEvent('planning:unlinkfromcoverage', {detail: {item}});
-
-                                        window.dispatchEvent(event);
-                                    }
-                                },
-                            }
-                        ],
+                        getActions: (item) => getPermittedActions(item),
                         onSpike: (item: IArticle) => onSpike(superdesk, item),
                         onSpikeMultiple: (items: Array<IArticle>) => onSpikeMultiple(superdesk, items),
                         onPublish: (item: IArticle) => onPublishArticle(superdesk, item),
@@ -162,6 +228,9 @@ const extension: IExtension = {
                         },
                     },
                 },
+
+                // Current set of planning actions have to be displayed both in authoring and list item actions
+                getAuthoringActions: (item) => getPermittedActions(item),
                 notifications: {
                     'email:notification:assignments': {name: superdesk.localization.gettext('Assignment')}
                 },
@@ -183,7 +252,7 @@ const extension: IExtension = {
                         },
                     },
                 ],
-                globalMenuHorizontal: displayTopbarWidget ? [AssignmentsList] : [],
+                globalMenuHorizontal: [AssignmentsCountTracker, ...(displayTopbarWidget ? [AssignmentsList] : [])],
             },
         };
 
diff --git a/client/planning-extension/src/extension_bridge.ts b/client/planning-extension/src/extension_bridge.ts
index c8de0b2c2..d2aa9ff00 100644
--- a/client/planning-extension/src/extension_bridge.ts
+++ b/client/planning-extension/src/extension_bridge.ts
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import {IVocabularyItem} from 'superdesk-api';
+import {IArticle, IVocabularyItem} from 'superdesk-api';
 import {IAssignmentItem, IEditorFieldProps, IPlanningAppState, IPlanningItem} from '../../interfaces';
 
 interface IEditorFieldVocabularyProps extends IEditorFieldProps {
@@ -16,6 +16,7 @@ interface IEditorFieldVocabularyProps extends IEditorFieldProps {
 interface IExtensionBridge {
     assignments: {
         utils: {
+            isContentLinkToCoverageAllowed(item: IArticle): boolean;
             getAssignmentTypeInfo(
                 assignment: IAssignmentItem,
                 contentTypes: Array<IVocabularyItem>,
@@ -42,6 +43,7 @@ interface IExtensionBridge {
                 language?: string,
                 fallbackField?: string
             ): string;
+            isContentLinkToCoverageAllowed(item: IArticle): boolean;
         };
         components: {
             EditorFieldVocabulary: React.ComponentType<IEditorFieldVocabularyProps>;
diff --git a/client/planning-extension/src/ingest_rule_autopost/AutopostIngestRuleEditor.tsx b/client/planning-extension/src/ingest_rule_autopost/AutopostIngestRuleEditor.tsx
index 66b9a7d99..7ce07ccee 100644
--- a/client/planning-extension/src/ingest_rule_autopost/AutopostIngestRuleEditor.tsx
+++ b/client/planning-extension/src/ingest_rule_autopost/AutopostIngestRuleEditor.tsx
@@ -1,9 +1,7 @@
 import * as React from 'react';
 import {
     IIngestRuleHandlerEditorProps,
-    ILiveResourcesProps,
     IRestApiResponse,
-    IVocabulary,
     IVocabularyItem
 } from 'superdesk-api';
 import {IAgenda} from '../../../interfaces';
@@ -12,7 +10,6 @@ import {superdesk} from '../superdesk';
 import {extensionBridge} from '../extension_bridge';
 
 const {EditorFieldVocabulary} = extensionBridge.ui.components;
-const {WithLiveResources} = superdesk.components;
 
 interface IExtraAttributes {
     autopost: boolean,
@@ -22,12 +19,27 @@ interface IExtraAttributes {
 
 type IProps = IIngestRuleHandlerEditorProps<IExtraAttributes>;
 
-export class AutopostIngestRuleEditor extends React.PureComponent<IProps> {
+interface IStateLoading {
+    loading: true;
+}
+
+interface IStateLoaded {
+    loading: false;
+    agendas: Array<IAgenda>;
+}
+
+type IState = IStateLoading | IStateLoaded;
+
+export class AutopostIngestRuleEditor extends React.PureComponent<IProps, IState> {
     constructor(props: IProps) {
         super(props);
 
         this.updateAttributes = this.updateAttributes.bind(this);
         this.updateAutopostValue = this.updateAutopostValue.bind(this);
+
+        this.state = {
+            loading: true,
+        };
     }
 
     updateAttributes<T extends keyof IExtraAttributes>(field: T, value: IExtraAttributes[T]) {
@@ -47,12 +59,26 @@ export class AutopostIngestRuleEditor extends React.PureComponent<IProps> {
         this.updateAttributes('autopost', value);
     }
 
+    componentDidMount(): void {
+        superdesk.httpRequestJsonLocal<IRestApiResponse<IAgenda>>({
+            method: 'GET',
+            path: '/agenda',
+        }).then((res) => {
+            this.setState({
+                loading: false,
+                agendas: res._items,
+            });
+        });
+    }
+
     render() {
+        if (this.state.loading) {
+            return null;
+        }
+
+        const {agendas} = this.state;
+        const calendars = superdesk.entities.vocabulary.getAll().get('event_calendars').items;
         const {gettext} = superdesk.localization;
-        const resources: ILiveResourcesProps['resources'] = [
-            {resource: 'vocabularies', ids: ['event_calendars']},
-            {resource: 'agenda'},
-        ];
 
         return (
             <div>
@@ -61,38 +87,31 @@ export class AutopostIngestRuleEditor extends React.PureComponent<IProps> {
                     value={this.props.rule.actions.extra?.autopost === true}
                     onChange={this.updateAutopostValue}
                 />
-                <WithLiveResources resources={resources}>{(resourcesResponse) => {
-                    const calendars = resourcesResponse[0] as IRestApiResponse<IVocabulary>;
-                    const agendas = resourcesResponse[1] as IRestApiResponse<IAgenda>;
-
-                    return (
-                        <React.Fragment>
-                            <EditorFieldVocabulary
-                                item={this.props.rule.actions.extra ?? {}}
-                                field="calendars"
-                                label={gettext('Calendars')}
-                                defaultValue={[]}
-                                onChange={this.updateAttributes}
-                                options={calendars._items[0].items.filter((item) => (
-                                    item.is_active !== false
-                                ))}
-                                valueAsString={true}
-                            />
-                            <EditorFieldVocabulary
-                                item={this.props.rule.actions.extra ?? {}}
-                                field="agendas"
-                                label={gettext('Agendas')}
-                                defaultValue={[]}
-                                onChange={this.updateAttributes}
-                                options={agendas._items.filter((item) => (
-                                    item.is_enabled !== false
-                                ))}
-                                valueAsString={true}
-                                valueKey="_id"
-                            />
-                        </React.Fragment>
-                    );
-                }}</WithLiveResources>
+
+                <EditorFieldVocabulary
+                    item={this.props.rule.actions.extra ?? {}}
+                    field="calendars"
+                    label={gettext('Calendars')}
+                    defaultValue={[]}
+                    onChange={this.updateAttributes}
+                    options={calendars.filter((item) => (
+                        item.is_active !== false
+                    ))}
+                    valueAsString={true}
+                />
+
+                <EditorFieldVocabulary
+                    item={this.props.rule.actions.extra ?? {}}
+                    field="agendas"
+                    label={gettext('Agendas')}
+                    defaultValue={[]}
+                    onChange={this.updateAttributes}
+                    options={agendas.filter((item) => (
+                        item.is_enabled !== false
+                    ))}
+                    valueAsString={true}
+                    valueKey="_id"
+                />
             </div>
         );
     }
diff --git a/client/planning-extension/src/ingest_rule_autopost/AutopostIngestRulePreview.tsx b/client/planning-extension/src/ingest_rule_autopost/AutopostIngestRulePreview.tsx
index 05806a06d..e0103f661 100644
--- a/client/planning-extension/src/ingest_rule_autopost/AutopostIngestRulePreview.tsx
+++ b/client/planning-extension/src/ingest_rule_autopost/AutopostIngestRulePreview.tsx
@@ -1,10 +1,9 @@
 import * as React from 'react';
-import {IIngestRuleHandlerPreviewProps, ILiveResourcesProps, IRestApiResponse, IVocabulary} from 'superdesk-api';
+import {IIngestRuleHandlerPreviewProps, IRestApiResponse} from 'superdesk-api';
 import {superdesk} from '../superdesk';
 import {IAgenda} from '../../../interfaces';
 import {extensionBridge} from '../extension_bridge';
 
-const {WithLiveResources} = superdesk.components;
 const {getUserInterfaceLanguageFromCV, getVocabularyItemFieldTranslated} = extensionBridge.ui.utils;
 
 type IProps = IIngestRuleHandlerPreviewProps<{
@@ -13,70 +12,94 @@ type IProps = IIngestRuleHandlerPreviewProps<{
     calendars?: Array<string>;
 }>;
 
-export class AutopostIngestRulePreview extends React.PureComponent<IProps> {
+interface IStateLoading {
+    loading: true;
+}
+
+interface IStateLoaded {
+    loading: false;
+    agendas: Array<IAgenda>;
+}
+
+type IState = IStateLoading | IStateLoaded;
+
+export class AutopostIngestRulePreview extends React.PureComponent<IProps, IState> {
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            loading: true,
+        };
+    }
+
+    componentDidMount(): void {
+        superdesk.httpRequestJsonLocal<IRestApiResponse<IAgenda>>({
+            method: 'GET',
+            path: '/agenda',
+        }).then((res) => {
+            this.setState({
+                loading: false,
+                agendas: res._items,
+            });
+        });
+    }
+
     render() {
-        const {gettext} = superdesk.localization;
-        const resources: ILiveResourcesProps['resources'] = [
-            {resource: 'vocabularies', ids: ['event_calendars']},
-            {resource: 'agenda'},
-        ];
+        if (this.state.loading) {
+            return null;
+        }
 
-        return (
-            <WithLiveResources resources={resources}>
-                {(resourcesResponse) => {
-                    const calendars = resourcesResponse[0] as IRestApiResponse<IVocabulary>;
-                    const agendas = resourcesResponse[1] as IRestApiResponse<IAgenda>;
+        const {agendas} = this.state;
+        const calendars = superdesk.entities.vocabulary.getAll().get('event_calendars').items;
+        const {gettext} = superdesk.localization;
 
-                    const calendarsNames: string = calendars._items[0].items
-                        .filter((calendar) => (
-                            (this.props.rule.actions.extra?.calendars ?? []).includes(calendar.qcode)
-                        ))
-                        .map((calendar) => getVocabularyItemFieldTranslated(
-                            calendar,
-                            'name',
-                            getUserInterfaceLanguageFromCV()
-                        ))
-                        .join(', ');
-                    const agendaNames: string = agendas._items
-                        .filter((agenda) => (
-                            (this.props.rule.actions.extra?.agendas ?? []).includes(agenda._id)
-                        ))
-                        .map((agenda) => agenda.name)
-                        .join(', ');
+        const calendarsNames: string = calendars
+            .filter((calendar) => (
+                (this.props.rule.actions.extra?.calendars ?? []).includes(calendar.qcode)
+            ))
+            .map((calendar) => getVocabularyItemFieldTranslated(
+                calendar,
+                'name',
+                getUserInterfaceLanguageFromCV()
+            ))
+            .join(', ');
+        const agendaNames: string = agendas
+            .filter((agenda) => (
+                (this.props.rule.actions.extra?.agendas ?? []).includes(agenda._id)
+            ))
+            .map((agenda) => agenda.name)
+            .join(', ');
 
-                    return (
-                        <React.Fragment>
-                            <div className="list-row">
-                                <span className="text-label text-label--auto">
-                                    {gettext('Post Items')}:
-                                </span>
-                                <span className="list-row__item">
-                                    {this.props.rule.actions.extra?.autopost === true ?
-                                        gettext('On') :
-                                        gettext('Off')
-                                    }
-                                </span>
-                            </div>
-                            <div className="list-row">
-                                <span className="text-label text-label--auto">
-                                    {gettext('Agendas')}:
-                                </span>
-                                <span className="list-row__item">
-                                    {agendaNames}
-                                </span>
-                            </div>
-                            <div className="list-row">
-                                <span className="text-label text-label--auto">
-                                    {gettext('Calendars')}:
-                                </span>
-                                <span className="list-row__item">
-                                    {calendarsNames}
-                                </span>
-                            </div>
-                        </React.Fragment>
-                    );
-                }}
-            </WithLiveResources>
+        return (
+            <React.Fragment>
+                <div className="list-row">
+                    <span className="text-label text-label--auto">
+                        {gettext('Post Items')}:
+                    </span>
+                    <span className="list-row__item">
+                        {this.props.rule.actions.extra?.autopost === true ?
+                            gettext('On') :
+                            gettext('Off')
+                        }
+                    </span>
+                </div>
+                <div className="list-row">
+                    <span className="text-label text-label--auto">
+                        {gettext('Agendas')}:
+                    </span>
+                    <span className="list-row__item">
+                        {agendaNames}
+                    </span>
+                </div>
+                <div className="list-row">
+                    <span className="text-label text-label--auto">
+                        {gettext('Calendars')}:
+                    </span>
+                    <span className="list-row__item">
+                        {calendarsNames}
+                    </span>
+                </div>
+            </React.Fragment>
         );
     }
 }
diff --git a/client/utils/index.ts b/client/utils/index.ts
index 226581456..5e4800a53 100644
--- a/client/utils/index.ts
+++ b/client/utils/index.ts
@@ -15,6 +15,7 @@ import {
     IPlanningItem,
     ICommonSearchParams,
     JUMP_INTERVAL,
+    ICoverageScheduledUpdate,
 } from '../interfaces';
 import {IUser} from 'superdesk-api';
 import {superdeskApi} from '../superdeskApi';
@@ -289,7 +290,7 @@ export const notifyError = (notify, error, defaultMessage) => {
  * @return {object} The user object found or ingest provider id, otherwise nothing is returned
  */
 export function getCreator(
-    item: IEventOrPlanningItem | IPlanningCoverageItem | IFeaturedPlanningItem,
+    item: IEventOrPlanningItem | IPlanningCoverageItem | IFeaturedPlanningItem | ICoverageScheduledUpdate,
     creator: string,
     users: Array<IUser>
 ): IUser | IIngestProvider['id'] | undefined {
diff --git a/index.ts b/index.ts
index 9717d0c20..33cc17ea5 100644
--- a/index.ts
+++ b/index.ts
@@ -1,14 +1,8 @@
 // styles
 import './client/styles/index.scss';
-
-import {IArticle} from 'superdesk-api';
-import {superdeskApi} from './client/superdeskApi';
-
-// scripts
 import planningModule from './client';
 import * as ctrl from './client/controllers';
 import {gettext} from './client/utils/gettext';
-import {isContentLinkToCoverageAllowed} from './client/utils/archive';
 import ng from 'superdesk-core/scripts/core/services/ng';
 
 configurePlanning.$inject = ['superdeskProvider'];
@@ -40,104 +34,62 @@ function configurePlanning(superdesk) {
             privileges: {
                 planning_locations_management: 1,
             },
-        })
-        .activity('planning.addto', {
-            label: gettext('Add to Planning'),
-            modal: true,
-            icon: 'calendar-list',
-            priority: 3000,
-            controller: ctrl.AddToPlanningController,
-            filters: [
-                {
-                    action: 'list',
-                    type: 'archive',
-                },
-                {
-                    action: 'external-app',
-                    type: 'addto-planning',
-                },
-            ],
-            group: gettext('Planning'),
-            privileges: {
-                planning_planning_management: 1,
-                archive: 1,
-            },
-            additionalCondition: ['archiveService', 'item', 'authoring',
-                function(archiveService, item: IArticle, authoring) {
-                    return !item.assignment_id &&
-                        !archiveService.isPersonal(item) &&
-                        !superdeskApi.entities.article.isLockedInOtherSession(item) &&
-                        !['correction'].includes(item.state) &&
-                        isContentLinkToCoverageAllowed(item) &&
-                        (
-                            authoring.itemActions(item).edit ||
-                            authoring.itemActions(item).correct ||
-                            authoring.itemActions(item).deschedule
-                        );
-                }],
-        })
-        .activity('planning.fulfil', {
-            label: gettext('Fulfil Assignment'),
-            icon: 'calendar-list',
-            modal: true,
-            priority: 2000,
-            controller: ctrl.FulFilAssignmentController,
-            filters: [
-                {
-                    action: 'list',
-                    type: 'archive',
-                },
-                {
-                    action: 'external-app',
-                    type: 'fulfill-assignment',
-                },
-            ],
-            group: gettext('Planning'),
-            privileges: {archive: 1},
-            additionalCondition: ['archiveService', 'item',
-                function(archiveService, item: IArticle) {
-                    return !item.assignment_id &&
-                        !archiveService.isPersonal(item) &&
-                        !superdeskApi.entities.article.isLockedInOtherSession(item) &&
-                        isContentLinkToCoverageAllowed(item) &&
-                        !['killed', 'recalled', 'unpublished', 'spiked', 'correction'].includes(item.state);
-                }],
-        })
-
-        // TAG: AUTHORING-ANGULAR
-        .activity('planning.unlink', {
-            label: gettext('Unlink as Coverage'),
-            icon: 'cut',
-            priority: 1000,
-            controller: ctrl.UnlinkAssignmentController,
-            filters: [
-                {
-                    action: 'list',
-                    type: 'archive',
-                },
-                {
-                    action: 'external-app',
-                    type: 'unlink-assignment',
-                },
-            ],
-            group: gettext('Planning'),
-            privileges: {archive: 1},
-
-            // keep in sync with client/planning-extension/src/extension.ts:126
-            additionalCondition: ['archiveService', 'item', 'authoring',
-                function(archiveService, item, authoring) {
-                    return item.assignment_id &&
-                        !archiveService.isPersonal(item) &&
-                        !superdeskApi.entities.article.isLockedInOtherSession(item) &&
-                        (
-                            authoring.itemActions(item).edit ||
-                            authoring.itemActions(item).correct ||
-                            authoring.itemActions(item).deschedule
-                        );
-                }],
         });
 }
 
+window.addEventListener('planning:fulfilassignment', (event: CustomEvent) => {
+    const element = window.$(document.createElement('div'));
+    const localScope = ng.get('$rootScope').$new(true);
+    const handleDestroy = () => {
+        localScope.$broadcast('$destroy');
+        element[0].remove();
+    };
+
+    localScope.resolve = handleDestroy;
+    localScope.reject = handleDestroy;
+    localScope.locals = {data: {item: event.detail.item}};
+
+    new ctrl.FulFilAssignmentController(
+        element,
+        localScope,
+        ng.get('sdPlanningStore'),
+        ng.get('notify'),
+        ng.get('gettext'),
+        ng.get('lock'),
+        ng.get('session'),
+        ng.get('userList'),
+        ng.get('api'),
+        ng.get('$timeout'),
+        ng.get('superdeskFlags'),
+        ng.get('desks')
+    );
+});
+
+window.addEventListener('planning:addToPlanning', (e: CustomEvent) => {
+    const newElement = document.createElement('div');
+    const jQueryElement = window.$(newElement);
+    const rootScope = ng.get('$rootScope');
+
+    newElement.className = 'modal__dialog ng-scope';
+    rootScope.locals = {data: {item: e.detail}};
+
+    rootScope.resolve = () => newElement.remove();
+
+    new ctrl.AddToPlanningController(
+        jQueryElement,
+        rootScope,
+        ng.get('sdPlanningStore'),
+        ng.get('notify'),
+        ng.get('gettext'),
+        ng.get('api'),
+        ng.get('lock'),
+        ng.get('session'),
+        ng.get('userList'),
+        ng.get('$timeout'),
+        ng.get('superdeskFlags'),
+    );
+});
+
 window.addEventListener('planning:unlinkfromcoverage', (event: CustomEvent) => {
     ctrl.UnlinkAssignmentController(
         event.detail,
diff --git a/package-lock.json b/package-lock.json
index ce2a51b32..0422d5bdb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1527,13 +1527,22 @@
       }
     },
     "browserify-rsa": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
-      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.1.tgz",
+      "integrity": "sha512-YBjSAiTqM04ZVei6sXighu679a3SqWORA3qZTEqZImnlkDIFtKc6pNutpjyZ8RJTjQtuYfeetkxM11GwoYXMIQ==",
       "dev": true,
       "requires": {
-        "bn.js": "^5.0.0",
-        "randombytes": "^2.0.1"
+        "bn.js": "^5.2.1",
+        "randombytes": "^2.1.0",
+        "safe-buffer": "^5.2.1"
+      },
+      "dependencies": {
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
+        }
       }
     },
     "browserify-sign": {
@@ -1735,9 +1744,9 @@
       }
     },
     "caniuse-db": {
-      "version": "1.0.30001660",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001660.tgz",
-      "integrity": "sha512-pwOmc3RUlTewTgGr0d5eKX/YWKb7ZDVcFeVz8G+7s3jma6z7ZTiXeRBRN8x0gTCOAuiBQX0Ny9ZIDWocECODKA==",
+      "version": "1.0.30001664",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30001664.tgz",
+      "integrity": "sha512-73+YTKw0KMawAD9ziTbZmcTYDATAHZVBD+K23Bnj0rUuEEX75M9F3j/3x5Nwweqz4F+djgIIuD+gltXFM7kTCQ==",
       "dev": true
     },
     "caseless": {
@@ -3200,9 +3209,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.5.23",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.23.tgz",
-      "integrity": "sha512-mBhODedOXg4v5QWwl21DjM5amzjmI1zw9EPrPK/5Wx7C8jt33bpZNrC7OhHUG3pxRtbLpr3W2dXT+Ph1SsfRZA==",
+      "version": "1.5.29",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.29.tgz",
+      "integrity": "sha512-PF8n2AlIhCKXQ+gTpiJi0VhcHDb69kYX4MtCiivctc2QD3XuNZ/XIOlbGzt7WAjjEev0TtaH6Cu3arZExm5DOw==",
       "dev": true
     },
     "elliptic": {
@@ -12143,7 +12152,7 @@
       }
     },
     "superdesk-core": {
-      "version": "github:superdesk/superdesk-client-core#61d411e5074fd6736693e67dcdf5b503d91198a8",
+      "version": "github:superdesk/superdesk-client-core#be5cb155334b485016df9eb9dea78e8e9848dedf",
       "from": "github:superdesk/superdesk-client-core#develop",
       "dev": true,
       "requires": {
diff --git a/server/features/planning_validate.feature b/server/features/planning_validate.feature
index 01d9d91fc..0e5935482 100644
--- a/server/features/planning_validate.feature
+++ b/server/features/planning_validate.feature
@@ -30,6 +30,11 @@ Feature: Planning Validate
             }
         }, {
             "_id": "planning", "name": "planning",
+            "editor":{
+                "place": {
+                    "enabled":true
+                }
+            },
             "schema": {
                 "slugline": {
                     "type": "string",
diff --git a/server/planning/events/events_tests.py b/server/planning/events/events_tests.py
index 11b88354a..a5d989741 100644
--- a/server/planning/events/events_tests.py
+++ b/server/planning/events/events_tests.py
@@ -620,3 +620,94 @@ def test_new_planning_is_published_when_adding_to_published_event(self):
             planning_item = planning_service.find_one(req=None, _id=planning_id)
             self.assertIsNotNone(planning_item)
             self.assertEqual(planning_item["pubstatus"], POST_STATE.USABLE)
+
+    def test_related_planning_item_fields_validation_on_post(self):
+        with self.app.app_context():
+            events_service = get_resource_service("events")
+            planning_service = get_resource_service("planning")
+            event = {
+                "type": "event",
+                "_id": "1234",
+                "occur_status": {
+                    "qcode": "eocstat:eos5",
+                    "name": "Planned, occurs certainly",
+                    "label": "Planned, occurs certainly",
+                },
+                "dates": {
+                    "start": datetime(2099, 11, 21, 11, 00, 00, tzinfo=pytz.UTC),
+                    "end": datetime(2099, 11, 21, 12, 00, 00, tzinfo=pytz.UTC),
+                    "tz": "Asia/Calcutta",
+                },
+                "calendars": [],
+                "state": "draft",
+                "language": "en",
+                "languages": ["en"],
+                "place": [],
+                "_time_to_be_confirmed": False,
+                "name": "Demo ",
+                "update_method": "single",
+            }
+            event_id = events_service.post([event])
+            planning = {
+                "planning_date": datetime(2099, 11, 21, 12, 00, 00, tzinfo=pytz.UTC),
+                "name": "Demo 1",
+                "place": [],
+                "language": "en",
+                "type": "planning",
+                "slugline": "slug",
+                "agendas": [],
+                "languages": ["en"],
+                "event_item": event_id[0],
+                "coverages": [
+                    {
+                        "coverage_id": "urn:newsmle264a179-5b1a-4b52-b73b-332660848cae",
+                        "planning": {
+                            "scheduled": datetime(2099, 11, 21, 12, 00, 00, tzinfo=pytz.UTC),
+                            "g2_content_type": "text",
+                            "language": "en",
+                            "genre": "None",
+                        },
+                        "news_coverage_status": {
+                            "qcode": "ncostat:int",
+                            "name": "coverage intended",
+                            "label": "Planned",
+                        },
+                        "workflow_status": "draft",
+                        "assigned_to": {},
+                        "firstcreated": datetime(2099, 11, 21, 12, 00, 00, tzinfo=pytz.UTC),
+                    }
+                ],
+            }
+            planning_id = planning_service.post([planning])
+            self.app.data.insert(
+                "planning_types",
+                [
+                    {
+                        "_id": "event",
+                        "name": "event",
+                        "editor": {
+                            "related_plannings": {"enabled": True},
+                        },
+                        "schema": {
+                            "related_plannings": {"planning_auto_publish": True},
+                        },
+                    },
+                    {
+                        "_id": "planning",
+                        "name": "planning",
+                        "editor": {"subject": {"enabled": False}},
+                        "schema": {"subject": {"required": True}},
+                    },
+                ],
+            )
+            get_resource_service("events_post").post(
+                [{"event": event_id[0], "pubstatus": "usable", "update_method": "single", "failed_planning_ids": []}]
+            )
+
+            event_item = events_service.find_one(req=None, _id=event_id[0])
+            self.assertEqual(len([event_item]), 1)
+            self.assertEqual(event_item.get("state"), "scheduled")
+
+            planning_item = planning_service.find_one(req=None, _id=planning_id[0])
+            self.assertEqual(len([planning_item]), 1)
+            self.assertEqual(planning_item.get("state"), "scheduled")
diff --git a/server/planning/validate/planning_validate.py b/server/planning/validate/planning_validate.py
index bb536b717..2d8afdd6e 100644
--- a/server/planning/validate/planning_validate.py
+++ b/server/planning/validate/planning_validate.py
@@ -17,6 +17,7 @@
 from apps.validate.validate import SchemaValidator as Validator
 
 from copy import deepcopy
+from planning.content_profiles.utils import get_enabled_fields
 
 REQUIRED_ERROR = "{} is a required field"
 
@@ -128,14 +129,16 @@ def _get_validator(self, doc):
         return get_resource_service("planning_types").find_one(req=None, name=doc[ITEM_TYPE])
 
     def _get_validator_schema(self, validator, validate_on_post):
-        """Get schema for given validator.
+        """Get schema for a given validator, excluding fields with None values,
+        and only include fields that are in enabled_fields."""
 
-        And make sure there is no `None` value which would raise an exception.
-        """
+        enabled_fields = get_enabled_fields(validator)
         return {
-            field: get_validator_schema(schema)
-            for field, schema in validator["schema"].items()
-            if schema and schema.get("validate_on_post", False) == validate_on_post
+            field: get_validator_schema(field_schema)
+            for field, field_schema in validator["schema"].items()
+            if field in enabled_fields
+            and field_schema
+            and field_schema.get("validate_on_post", False) == validate_on_post
         }
 
     def _validate(self, doc):