2.3 empty labels

@jockri hiding labels ok to merge in 2.3 as well? need it :)

cleaned it up a bit too.