new data format
change to how we do search with some regex removed