Fixes #3639, Type filters on live map unreliable

- extend type filter for live map to cover all supported types