Add better query parsing and sanitation.