Removes query dependency better logging