[CHANGE] srv-id with formatter; removed useless if-statement