[esf] Solved an ugly bug :), figures handles were messed up because the drop down menu automatically changes the order when selecting figures