clean up extra com. queries
more indices