adapted to 0.15.2-dev, filter from server