added all views
renamed variable
simplified query