Fix issue where multiple expand params were not getting passed through (#130)