Fix regex expression and use a right extract content