CEXT - 559 # add stay in system
CEXT - 585 # add check auth for maps
CEXT - 559 # add check auth for maps
fix