Changed ALL queries to be views as well