bug with limiting show length is fixed
merge conflict resolved