Add entity option and refactor query and reports.