fixed table calls / changed list to locations