Remove city selection field that was readded in last merge
Fix invalid template variable errors for report edit forms in backend
Make incident time and date input fields always visible