rudimentary query langage tested
fixed some stuff