implementing fix for server side execute tag logic