Fixes and updated search