Added advanced filtering capabilities.