@ClickandShare.NET your fix if correct, thank you for reporting and proposed fix, you can also apply fix from this ticket - https://github.com/unacms/UNA/issues/5131