Fix bug where extra deployed funnels collect little or no water

Fixes #3176. Moved container filling code into its own function and called it from the correct place.