slightly better index and flags
Merge branch 'services_index'