* use denormalised ID values
* small fixes
Merge pull request #214 from urosj/v4

CS to use denormalised ID values in ES