Removed all search tabs except Text and Entity
Merge branch 'master' into bratmod-python2.7