Update: Fix bugs with restangular