Improve properties names and restrict reporting window inside a threshold