Added short codes fix to custom functions.