Filter for trips implemented on controller level
Merge remote-tracking branch 'origin/develop' into develop