Fix site and siteid options not working