Fixed sanitization exploit
Fixed merge conflict and added code to clear queue
Fixed bug with last commit