Merge aleksandyr - Fix undefined variable
Merge aleksandyr - New literal for Trash folder
Merge aleksandyr - Adding check to search to suppress errors/warnings on empty search