More cleanup, and query concepts now automatically select a source if none exists