Fixed a few injection issues
Prevent duplicate entries