[IMP] Query should pass through orm and as such the refreshes can be removed...

[IMP] Query should pass through orm and as such the refreshes can be removed in the code, which will go faster as it is done automatically by the new api