Improve geo viewer filter compositioning