AGP-342: handle matching for session variable