Fixed another NPE, re-fixed search bug (???)