Judgment criteria form missing fields

#283
Created separate issue for this #354