added filtering by time to all users