Add subvalue conditions/expressions & bookmarks