More fixes

Still attempting to get the search feature to work, almost there