tstimeshifter: Added support for buffering query - whitspace consistency