add extra conditionals for location block