Axolotls and Glow Squids spawn even in bubble columns and in flowing water streams

Glowing Squids and Axolotls can spawn even in bubble columns and flowing water streams.

They became a nightmare in my server after the release of that snapshot since they spawn under any water area that is higher than 2 blocks, including water elevators, pools, farms, etc.

This CAN'T be the case they have to have some restrictions in their spawning, please fix this.