Added HS boundary check, flag for multiple elementary, and consistency around boundary language