Fixed a little with Rx-based dataservice