minor refactoring and new tm-uno data and query mapping