Fix ALV-673
Fix ALV-636
Minor related workflows UI fixes