search now works for pages alone
merge conflict fixed