Fix last few app logic things regarding hygiene reporting
Also incidency is now being handled