fixed expression filter
fixed naming