Also add location to filter block