Updated the parser to recognize "$eid:123" form of entity ID.

This is made so that ID-related queries can be saved in a form
that allows the importer to change the IDs on import/restart.