Issue #19: Increase query performance by skipping flushing