Allow filters in dump; add AvgShips in where