Adding search capability
modify export function
add log