More updates to feedback EP4 handling