Label on field macro now works when id_prefix is provided