updates to code#1

scottnath wants to merge 2 commits intobejean:masterbejean/advanced-search-by-my-solr-server:masterfrom

scottnath:masterscottnath/advanced-search-by-my-solr-server:masterCopy head branch name to clipboard