added Q.when
fixed find