Add modified queue
Add toJSON to search