Use TARGET directly
Fix slug validation