ST: Updated current page matcher