de-bidification
Fix measurements routes