fix on actionkey click call search twice
fix fc
merge
Merge remote-tracking branch 'up/master'