Improve build file: add new version code and variant filter