Error fixed. Added Support for Filtering