Add some more options to search method