Buffer optimization fix for empty results

Arndt, Danielrequested to merge
github/fork/aprokop/buffer_opt into master

Created by: aprokop

Fix #205 (closed).

Merge request reports