Add no-thumbnail behaviour
Fix timed scopes