Added array entry token and shortcuts to match entry, key or value