Fixed bug which showed in test env - (need to set set show param to null)