service layer refactor; minor fix in stream ui