removed Companion completely
changed storage of indexing for queries so it can be made more dynamic