Bringing david-search and master in sync