case 3659 - Refactor bookmarks to use tableselect_form type.
Merge branch 'case-3659' into new-search

* case-3659:
  case 3659 - Refactor bookmarks to use tableselect_form type.