Commit 5be0de0d introduced the idea of moving-up old saved searches to make
room for Custom Queues but failed to account for cases where the system
has more than 30 saved searches.

This commit addresses the issue by just re-inserting the old records after
queues are imported. It also adds validates & reformat the search criteria
to make the expected format.