Fix categories decoding
Better address display