More work on Adv Search

Same kind of changes as last commit, just more of them.