added fix to location field (sometimes was empty)