spec updates
fixed indexing all fields