Versioning externals and some revinements for query tool