added map-only and dfs-only options