Major SQLi changes