#193, adjusted lookups
#181, added delete capability to Internal CCRs