fix for geo shape filter and fix tests