make search more specific, add logging