Rules updated
fixed map values component