Fix value search, was broken after new parser