Added in the warehouse, more SQL inject proof