Fixing issues in new work UI see BT#6418