Fixed key error bugs when filling out system form