better parsing for get-values