Completed Fixes of choose section