added documentation and fixed filter mapping