Switch to app variables instead of entity variables