Change method to final
A lot of refactor and fix query incidents details bug