Optimized query, support for edificio by `nombre' extraction.