phpDoc fixes

return the view models when needed