New style and fixes for buffer search
Merge