Honda Unicorn manufacturers

The following things have not been kept in mind by Honda Unicorn manufacturers :1) Fuel tank lock - petrol filling as well as petrol locking. At least they should have thought of a novel method to provide tamper-proof Company-built petrol lock (this is in view of the current trend of the petrol cost where petrol pilfering is taking place) identical to the ignition key. The petrol filling cap & lock are identical to those provided by Hero Honda Passion. My experience has been that from these locks, water, particularly in the rainy season, finds its way into the fuel tank. I have had to replace the entire fuel due to this problem twice. I have been told by my friends who own Pulsar that they too have faced similar problems.