Bug fix advertisement + indices