Fix vertical metric terms, add SEM option for horizontal metric terms

Fix vertical metric terms, add SEM option for horizontal metric terms #2196