This push is to fix the possibility of sql injection