Reorganize template
Fix for exception when editing an interception case and saving the resulting data
Better template organization
More fix for population count
Interception web