Made makefile deterministic wrt. the input source files
Queries working