Removed PluralService, added two collection names
Fixed merge conflict
Hot fix view list bug