Fix bug introduced in fix for filtering so that geometries work in the
grid filter editor and the advanced filter functionality has no
anomolies.