Major bug fix on menu insert point selection