Fixed regexp and show added