Changed filtering to be by attribute only

Signed-off-by: Ozan Turgut <ozanturgut@gmail.com>