Merge pull request #160 from lance0428/master

Fix for #159 force close during feed search
Merge pull request #162 from lance0428/master

Fix registration regression post #151 commit