Fixed some minor bugs in basic search