Update to Drupal 10 support

Attached patch with fixes.

Not sure about support for Drupal 8, we may stop supporting it or continue to support it.
Tested on Drupal 9.4.

Thanks vmarchuk, This is now resolved.

Automatically closed - issue fixed for 2 weeks with no activity.