EST-256: add reporting flags to occupancy; some refactoring on occupancy