refactore jq-common WIP