Code for issue #12 and #13

Refresh button in options
Resolved bug which showed only the last page of search