Tweak how _expand_args works
Make search method work