Fix n + 1 query on user index