Added default_scope to avoid N+1 problem
Fixed broken build