Closes #48 additional DB table indexes