improved calling of locations and specialties to match MVC model