RF-13758: revert previous, fix resource identification