Added filtering and searching
Improved error handling