Corrected bugs in save/search feature