Fixing filter to use Device Name and Point Name.