Task #150: Fix bug for empty site field