fixed logic for adding to filter
working on set data, added __call