Changed queries views to match Dashboard