[bug 873154] Search and filter functionality

A combination of @k88hudson and my changes