CONTRIB-5119, CONTRIB-5264 Fixed completion states and restriction hiding