Updating views to separate Queries and notifications.

refs #126