Issue #2671228 by dimilias, pfrenssen, borisson_, drunken monkey: Fixed support for arbitrary strings as entity IDs.