Small fixes to match and question forms after locking