added filtering options and search by name