Pumping oil surrounded by water fixed

If there is already fluid in tank tries to find that one, if not finds any accepted fluid.
Fixes #1224