Added better filtering

Signed-off-by: Michael Pauley <mdpauley@gmail.com>