Improved some queries
Merged changes
Added option to map repos to licenses