Created better overflow behaviour
* Extraction tube and injection tube are currently destinations for overflow
* Fixed error in requesting tube introduced by refactor