adding sane defaults to advanched search, minor api cleanup