Fixed regex and removed duplicate entries.