[PLAT-5023] Restored selective behaviour to enumObjects