Added new way of filtering.
Still to implement various options to use them