improve meta handling