did some fixing of empty states