fix pluralization
add index