Fix location logic. Adding requests