Fix search folder recognition some more and some copy/paste fixes
LILY-164: Case and Deal edit work once more