Add ao limit, update marker control