Simplication of search method

+ minor cleanup of initialize & request