Fix N+1 in users index