Minor fixes & search improvements