Fixed #18

CF Insecure Queries