#32 - refactor common code, fixes get by service