Legal form support; KeyError fix