[editor] Improve element property conditionals

There are still some problems. It works a lot better than before. Adding 
this as an intermediate solution.