EMCS-6518: Update connector, filter