fix for IDs - added support with IDs with $ in them - close #682