fixed match pages
merged changes