Often seeing "consistent query buffer is full, cannot accept new consistent queries"

@agreed, this is side effect of race condition issue and is addressed in this PR