Parsing ids is now smarter, close #9