fix local master + fix default custom entity report