Added filtering to all fetch and the delete methods