Fix public and N+1 problem