fix #24; finished map API, filters are not done though