Reordered sim table filter and added missing tags