Added label for empty path
Fixed path selection