Refs #10021; bugfix and improved speed

git-svn-id: https://svn.eionet.europa.eu/repositories/Naaya/trunk/eggs@19749 a0171fae-0946-0410-966d-b1775066cd26
released Naaya 3.2.16

git-svn-id: https://svn.eionet.europa.eu/repositories/Naaya/trunk/eggs@19750 a0171fae-0946-0410-966d-b1775066cd26