Remove Servant global, fix (tab) indexing