Added safe search
Added command line param
Fixed conflict