Adding text independent searches and cleanup