Support home state, fix labelling