Fix for property labels and bubble chart