added filtering to map