added Horizons, refined queries, seems to function