Fixed filters in descriptors - cleaned up logging