various tweaks, explicit reindex isnt needed