Fix short codes issue
fixed merge