Fix for #315, backport xbmc always on option

fix deleted line
Update search_queue.py
Moved changes to dev