Fix various quirks & implement search