Fixing keyword resolution
Removing custom confirmation
Fixing regex generation