Removed all N+1 queries after globalization