SWC-1042: from code review, pull out entity and wiki ids into portal properties