Handle empty work fields

        - Also update maintainer info