Many fixes for [mappy] filter. Changed alorithm, so be care for update.