Reorganize template
Fix for possible null pointer exception in population calculation
More fix for population count
Interception web