class page and searching working correctly now