merge cards 97 and 77, search form alterations, into master