Filter trip

Vlad please review the code and merge