Fix for resource tags in expressions