Fixed lot of advanced editor issues