fix queue and build gauge controller