moved sortiment filter to functions
manually merged conflicts