bug fixes -- multiple conditions to filter, complex set attribute