Better query for deciding what to show on report