Add airports and fix annotation width problem.