updated some advanced search options
correct behavior of back & up actions; maintain query input when returning to search activity
clean up
Merge remote-tracking branch 'origin/master'