-bugs fix

Bugs that come from removing query time