Fixed tank fill / drain

Tested with FM and BC pipes