Fix queries with && or || operators

ffs/parser.js was rebuild with "make ffs"
Update wizard tests