Search working as intended, with a few minor bugs.