updated ST_Contains to generic