add plurals macro
Fix getSources' check for Entity