fix for IDs with @ in them, preparing for workers - close #685