Updated with database lookup of watched flag