add filter for station and category
adjust constructor call as ParameterCount is now static inner class
Merge remote-tracking branch 'jansch/develop'