Added list-search directive
Added experimental clustering to map