v0.3 fixes - but still bug in tool to service id collector