20141107 Add filtering by types