Merge single colum search into master branch