replace shorthand $s back to $scope