Changed list views to reduce number of COUNT queries