First working version for UBC-001 and UBC-002 queries