better support for code labels and areas