Fix Madrid Url - Retriever refactorized - Service Filter Working