Added support for modal data display and filtering