Don't rely on after save trigger, do all querying up front

Undo some hacks that might be causing issues. This might be a bit slower checking if something is unread.