Fix subject viewer events