Search full, entry delete

Various fixes