Cleanup DataModel references

Bring back group filtering too.