updating Org Row from AdminMap enabled + small fixes