Enable filtering by model/primary key
Remove unmatched shortcode
Merge branch 'filtering'