Add filter options to family list view
Merge remote-tracking branch 'origin/dev' into dev