Reverted changes to last_watched in entities