Fixed parsing for analyze targets