Inner join and indexing on queries
Reduced querying of data to one request, fetching the data type along
the way
Small changes
Merge branch 'master' of github.com:PUMA-IAM/puma-pip-utils