[OE-3987] hide deleted items and use activeOrPk where appropriate