Locations Filter modif

This filter does not yet incorporate the user creadentials to him appropriately, however will be done next.