Fixed up all queries for special chars and security