Fixed some issues from the Advanced Search splitup.

These are small fixes. There are bigger UX issues I'll file bugs for.

small r?